diff --git a/crates/ruff_db/src/parsed.rs b/crates/ruff_db/src/parsed.rs index 77c71cc516..ad241b3ded 100644 --- a/crates/ruff_db/src/parsed.rs +++ b/crates/ruff_db/src/parsed.rs @@ -92,14 +92,14 @@ impl ParsedModule { self.inner.store(None); } - /// Returns a pointer for this [`ParsedModule`]. + /// Returns the pointer address of this [`ParsedModule`]. /// /// The pointer uniquely identifies the module within the current Salsa revision, /// regardless of whether particular [`ParsedModuleRef`] instances are garbage collected. - pub fn as_ptr(&self) -> *const () { + pub fn addr(&self) -> usize { // Note that the outer `Arc` in `inner` is stable across garbage collection, while the inner // `Arc` within the `ArcSwap` may change. - Arc::as_ptr(&self.inner).cast() + Arc::as_ptr(&self.inner).addr() } } @@ -202,9 +202,13 @@ mod indexed { /// Returns the node at the given index. pub fn get_by_index<'ast>(&'ast self, index: NodeIndex) -> AnyRootNodeRef<'ast> { + let index = index + .as_u32() + .expect("attempted to access uninitialized `NodeIndex`"); + // Note that this method restores the correct lifetime: the nodes are valid for as // long as the reference to `IndexedModule` is alive. - self.index[index.as_usize()] + self.index[index as usize] } } @@ -220,7 +224,7 @@ mod indexed { T: HasNodeIndex + std::fmt::Debug, AnyRootNodeRef<'a>: From<&'a T>, { - node.node_index().set(self.index); + node.node_index().set(NodeIndex::from(self.index)); self.nodes.push(AnyRootNodeRef::from(node)); self.index += 1; } diff --git a/crates/ruff_linter/src/rules/flake8_annotations/helpers.rs b/crates/ruff_linter/src/rules/flake8_annotations/helpers.rs index c0289225f1..adff541532 100644 --- a/crates/ruff_linter/src/rules/flake8_annotations/helpers.rs +++ b/crates/ruff_linter/src/rules/flake8_annotations/helpers.rs @@ -137,7 +137,7 @@ impl AutoPythonType { let expr = Expr::Name(ast::ExprName { id: Name::from(binding), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, }); Some((expr, vec![no_return_edit])) @@ -204,7 +204,7 @@ fn type_expr(python_type: PythonType) -> Option { Expr::Name(ast::ExprName { id: name.into(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, }) } diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs index 8708e4c487..d1ba8edcdb 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs @@ -52,13 +52,13 @@ impl AlwaysFixableViolation for AssertFalse { fn assertion_error(msg: Option<&Expr>) -> Stmt { Stmt::Raise(ast::StmtRaise { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, exc: Some(Box::new(Expr::Call(ast::ExprCall { func: Box::new(Expr::Name(ast::ExprName { id: "AssertionError".into(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), arguments: Arguments { args: if let Some(msg) = msg { @@ -68,10 +68,10 @@ fn assertion_error(msg: Option<&Expr>) -> Stmt { }, keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }))), cause: None, }) diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs index f753152e4d..7747f07df7 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs @@ -113,7 +113,7 @@ fn type_pattern(elts: Vec<&Expr>) -> Expr { elts: elts.into_iter().cloned().collect(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, } .into() diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs index 6244634ffa..7e378a14ba 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs @@ -53,11 +53,11 @@ fn assignment(obj: &Expr, name: &str, value: &Expr, generator: Generator) -> Str attr: Identifier::new(name.to_string(), TextRange::default()), ctx: ExprContext::Store, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })], value: Box::new(value.clone()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); generator.stmt(&stmt) } diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs index 0ae136c25e..2618c4765a 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs @@ -209,18 +209,18 @@ fn fix_unnecessary_dict_comprehension(value: &Expr, generator: &Comprehension) - }, keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; Expr::Call(ExprCall { func: Box::new(Expr::Name(ExprName { id: "dict.fromkeys".into(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), arguments: args, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }) } diff --git a/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs b/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs index 27c0868332..2df842b862 100644 --- a/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs +++ b/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs @@ -178,21 +178,21 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) { .collect(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, }); let node1 = Expr::Name(ast::ExprName { id: arg_name.into(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); let node2 = Expr::Attribute(ast::ExprAttribute { value: Box::new(node1), attr: Identifier::new(attr_name.to_string(), TextRange::default()), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); let node3 = Expr::Call(ast::ExprCall { func: Box::new(node2), @@ -200,10 +200,10 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) { args: Box::from([node]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); let call = node3; @@ -223,7 +223,7 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) { }) .collect(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); let bool_op = node; diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs index fea4985036..1f4c6210e4 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs @@ -92,14 +92,14 @@ pub(crate) fn duplicate_literal_member<'a>(checker: &Checker, expr: &'a Expr) { Expr::Tuple(ast::ExprTuple { elts: unique_nodes.into_iter().cloned().collect(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: false, }) }), value: subscript.value.clone(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, }); let fix = Fix::applicable_edit( diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs index 2fefb8e01d..47d26ca850 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs @@ -187,7 +187,7 @@ fn generate_pep604_fix( op: Operator::BitOr, right: Box::new(right.clone()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })) } else { Some(right.clone()) @@ -202,7 +202,7 @@ fn generate_pep604_fix( } static VIRTUAL_NONE_LITERAL: Expr = Expr::NoneLiteral(ExprNoneLiteral { - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, range: TextRange::new(TextSize::new(0), TextSize::new(0)), }); diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs index 77e902da12..beba88b70a 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs @@ -133,17 +133,17 @@ fn generate_union_fix( // Construct the expression as `Subscript[typing.Union, Tuple[expr, [expr, ...]]]` let new_expr = Expr::Subscript(ExprSubscript { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, value: Box::new(Expr::Name(ExprName { id: Name::new(binding), ctx: ExprContext::Store, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), slice: Box::new(Expr::Tuple(ExprTuple { elts: nodes.into_iter().cloned().collect(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: false, })), diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs index 12c4b01fb9..eb188c245d 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs @@ -205,13 +205,13 @@ fn create_fix( let new_literal_expr = Expr::Subscript(ast::ExprSubscript { value: Box::new(literal_subscript.clone()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, slice: Box::new(if literal_elements.len() > 1 { Expr::Tuple(ast::ExprTuple { elts: literal_elements.into_iter().cloned().collect(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: true, }) @@ -235,7 +235,7 @@ fn create_fix( UnionKind::BitOr => { let none_expr = Expr::NoneLiteral(ExprNoneLiteral { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); let union_expr = pep_604_union(&[new_literal_expr, none_expr]); let content = checker.generator().expr(&union_expr); diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_numeric_union.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_numeric_union.rs index b493474929..1197e70ea6 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_numeric_union.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_numeric_union.rs @@ -261,7 +261,7 @@ fn generate_pep604_fix( op: Operator::BitOr, right: Box::new(right.clone()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })) } else { Some(right.clone()) diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs index 0765eeb48d..3945afde33 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs @@ -140,12 +140,12 @@ pub(crate) fn unnecessary_literal_union<'a>(checker: &Checker, expr: &'a Expr) { slice: Box::new(Expr::Tuple(ast::ExprTuple { elts: literal_exprs.into_iter().cloned().collect(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: true, })), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, }); @@ -164,12 +164,12 @@ pub(crate) fn unnecessary_literal_union<'a>(checker: &Checker, expr: &'a Expr) { slice: Box::new(Expr::Tuple(ast::ExprTuple { elts, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: true, })), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, })) } else { diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs index 56d838b950..5906e7f411 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs @@ -134,12 +134,12 @@ pub(crate) fn unnecessary_type_union<'a>(checker: &Checker, union: &'a Expr) { id: Name::new_static("type"), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), slice: Box::new(pep_604_union(&elts)), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); if other_exprs.is_empty() { @@ -159,7 +159,7 @@ pub(crate) fn unnecessary_type_union<'a>(checker: &Checker, union: &'a Expr) { id: Name::new_static("type"), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), slice: Box::new(Expr::Subscript(ast::ExprSubscript { value: subscript.value.clone(), @@ -171,22 +171,22 @@ pub(crate) fn unnecessary_type_union<'a>(checker: &Checker, union: &'a Expr) { id: type_member, ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }) }) .collect(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, })), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); if other_exprs.is_empty() { @@ -202,12 +202,12 @@ pub(crate) fn unnecessary_type_union<'a>(checker: &Checker, union: &'a Expr) { elts: exprs.into_iter().cloned().collect(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, })), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); checker.generator().expr(&union) diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs index bd3059e430..8087730352 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs @@ -301,7 +301,7 @@ fn elts_to_csv(elts: &[Expr], generator: Generator, flags: StringLiteralFlags) - }) .into_boxed_str(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, flags, }); Some(generator.expr(&node)) @@ -367,14 +367,14 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr Expr::from(ast::StringLiteral { value: Box::from(*name), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, flags: checker.default_string_flags(), }) }) .collect(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, }); diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( @@ -404,14 +404,14 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr Expr::from(ast::StringLiteral { value: Box::from(*name), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, flags: checker.default_string_flags(), }) }) .collect(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( checker.generator().expr(&node), @@ -440,7 +440,7 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr elts: elts.clone(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( checker.generator().expr(&node), @@ -485,7 +485,7 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr elts: elts.clone(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, }); diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs index 650452c6a0..6a5f89a6af 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs @@ -166,7 +166,7 @@ fn assert(expr: &Expr, msg: Option<&Expr>) -> Stmt { test: Box::new(expr.clone()), msg: msg.map(|msg| Box::new(msg.clone())), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }) } @@ -176,7 +176,7 @@ fn compare(left: &Expr, cmp_op: CmpOp, right: &Expr) -> Expr { ops: Box::from([cmp_op]), comparators: Box::from([right.clone()]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }) } @@ -296,7 +296,7 @@ impl UnittestAssert { op: UnaryOp::Not, operand: Box::new(expr.clone()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }), msg, ) @@ -370,7 +370,7 @@ impl UnittestAssert { }; let node = Expr::NoneLiteral(ast::ExprNoneLiteral { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); let expr = compare(expr, cmp_op, &node); Ok(assert(&expr, msg)) @@ -387,7 +387,7 @@ impl UnittestAssert { id: Name::new_static("isinstance"), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let node1 = ast::ExprCall { func: Box::new(node.into()), @@ -395,10 +395,10 @@ impl UnittestAssert { args: Box::from([(**obj).clone(), (**cls).clone()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let isinstance = node1.into(); if matches!(self, UnittestAssert::IsInstance) { @@ -408,7 +408,7 @@ impl UnittestAssert { op: UnaryOp::Not, operand: Box::new(isinstance), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let expr = node.into(); Ok(assert(&expr, msg)) @@ -429,14 +429,14 @@ impl UnittestAssert { id: Name::new_static("re"), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let node1 = ast::ExprAttribute { value: Box::new(node.into()), attr: Identifier::new("search".to_string(), TextRange::default()), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let node2 = ast::ExprCall { func: Box::new(node1.into()), @@ -444,10 +444,10 @@ impl UnittestAssert { args: Box::from([(**regex).clone(), (**text).clone()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let re_search = node2.into(); if matches!(self, UnittestAssert::Regex | UnittestAssert::RegexpMatches) { @@ -457,7 +457,7 @@ impl UnittestAssert { op: UnaryOp::Not, operand: Box::new(re_search), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; Ok(assert(&node.into(), msg)) } diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs index 7576c71fc1..398bd63860 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs @@ -421,7 +421,7 @@ pub(crate) fn duplicate_isinstance_call(checker: &Checker, expr: &Expr) { .collect(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, }; let isinstance_call = ast::ExprCall { @@ -430,7 +430,7 @@ pub(crate) fn duplicate_isinstance_call(checker: &Checker, expr: &Expr) { id: Name::new_static("isinstance"), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(), ), @@ -438,10 +438,10 @@ pub(crate) fn duplicate_isinstance_call(checker: &Checker, expr: &Expr) { args: Box::from([target.clone(), tuple.into()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(); @@ -458,7 +458,7 @@ pub(crate) fn duplicate_isinstance_call(checker: &Checker, expr: &Expr) { .chain(after) .collect(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(); let fixed_source = checker.generator().expr(&bool_op); @@ -552,21 +552,21 @@ pub(crate) fn compare_with_tuple(checker: &Checker, expr: &Expr) { elts: comparators.into_iter().cloned().collect(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, }; let node1 = ast::ExprName { id: id.clone(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let node2 = ast::ExprCompare { left: Box::new(node1.into()), ops: Box::from([CmpOp::In]), comparators: Box::from([node.into()]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let in_expr = node2.into(); let mut diagnostic = checker.report_diagnostic( @@ -589,7 +589,7 @@ pub(crate) fn compare_with_tuple(checker: &Checker, expr: &Expr) { op: BoolOp::Or, values: iter::once(in_expr).chain(unmatched).collect(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; node.into() }; diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs index afc2e88b04..668dd6920a 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs @@ -232,7 +232,7 @@ fn check_os_environ_subscript(checker: &Checker, expr: &Expr) { } }), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let new_env_var = node.into(); diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs index 7ba5d6410a..1f4c12179f 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs @@ -188,7 +188,7 @@ pub(crate) fn if_expr_with_true_false( id: Name::new_static("bool"), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(), ), @@ -196,10 +196,10 @@ pub(crate) fn if_expr_with_true_false( args: Box::from([test.clone()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(), ), @@ -227,7 +227,7 @@ pub(crate) fn if_expr_with_false_true( op: UnaryOp::Not, operand: Box::new(test.clone()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(), ), @@ -282,7 +282,7 @@ pub(crate) fn twisted_arms_in_ifexpr( body: Box::new(node1), orelse: Box::new(node), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( checker.generator().expr(&node3.into()), diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs index 37f3c16a8e..d00393aa66 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs @@ -186,7 +186,7 @@ pub(crate) fn negation_with_equal_op(checker: &Checker, expr: &Expr, op: UnaryOp ops: Box::from([CmpOp::NotEq]), comparators: comparators.clone(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( checker.generator().expr(&node.into()), @@ -242,7 +242,7 @@ pub(crate) fn negation_with_not_equal_op( ops: Box::from([CmpOp::Eq]), comparators: comparators.clone(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( checker.generator().expr(&node.into()), @@ -284,7 +284,7 @@ pub(crate) fn double_negation(checker: &Checker, expr: &Expr, op: UnaryOp, opera id: Name::new_static("bool"), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let node1 = ast::ExprCall { func: Box::new(node.into()), @@ -292,10 +292,10 @@ pub(crate) fn double_negation(checker: &Checker, expr: &Expr, op: UnaryOp, opera args: Box::from([*operand.clone()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement( checker.generator().expr(&node1.into()), diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs index 505bfe58f7..1441c87154 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs @@ -190,7 +190,7 @@ pub(crate) fn if_else_block_instead_of_dict_get(checker: &Checker, stmt_if: &ast attr: Identifier::new("get".to_string(), TextRange::default()), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let node3 = ast::ExprCall { func: Box::new(node2.into()), @@ -198,17 +198,17 @@ pub(crate) fn if_else_block_instead_of_dict_get(checker: &Checker, stmt_if: &ast args: Box::from([node1, node]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let node4 = expected_var.clone(); let node5 = ast::StmtAssign { targets: vec![node4], value: Box::new(node3.into()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let contents = checker.generator().stmt(&node5.into()); @@ -299,7 +299,7 @@ pub(crate) fn if_exp_instead_of_dict_get( attr: Identifier::new("get".to_string(), TextRange::default()), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let fixed_node = ast::ExprCall { func: Box::new(dict_get_node.into()), @@ -307,10 +307,10 @@ pub(crate) fn if_exp_instead_of_dict_get( args: Box::from([dict_key_node, default_value_node]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let contents = checker.generator().expr(&fixed_node.into()); diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs index 97cbcb76ac..db904d6dd1 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs @@ -266,13 +266,13 @@ fn assignment_ternary( body: Box::new(body_value.clone()), orelse: Box::new(orelse_value.clone()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let node1 = ast::StmtAssign { targets: vec![target_var.clone()], value: Box::new(node.into()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; node1.into() } @@ -282,13 +282,13 @@ fn assignment_binary_and(target_var: &Expr, left_value: &Expr, right_value: &Exp op: BoolOp::And, values: vec![left_value.clone(), right_value.clone()], range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let node1 = ast::StmtAssign { targets: vec![target_var.clone()], value: Box::new(node.into()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; node1.into() } @@ -296,12 +296,12 @@ fn assignment_binary_and(target_var: &Expr, left_value: &Expr, right_value: &Exp fn assignment_binary_or(target_var: &Expr, left_value: &Expr, right_value: &Expr) -> Stmt { (ast::StmtAssign { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, targets: vec![target_var.clone()], value: Box::new( (ast::ExprBoolOp { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, op: BoolOp::Or, values: vec![left_value.clone(), right_value.clone()], }) diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs index 679797a258..1d64db5fc8 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs @@ -256,7 +256,7 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) { left: left.clone(), comparators: Box::new([right.clone()]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })) } @@ -264,7 +264,7 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) { op: ast::UnaryOp::Not, operand: Box::new(if_test.clone()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), } } else if if_test.is_compare_expr() { @@ -277,7 +277,7 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) { id: Name::new_static("bool"), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let call_node = ast::ExprCall { func: Box::new(func_node.into()), @@ -285,10 +285,10 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) { args: Box::from([if_test.clone()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; Some(Expr::Call(call_node)) } else { @@ -301,7 +301,7 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) { Stmt::Return(ast::StmtReturn { value: Some(Box::new(expr.clone())), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }) }); diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs index 88e1693d29..5ad99330e8 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs @@ -165,7 +165,7 @@ pub(crate) fn convert_for_loop_to_any_all(checker: &Checker, stmt: &Stmt) { ops: Box::from([op]), comparators: Box::from([comparator.clone()]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; node.into() } else { @@ -173,7 +173,7 @@ pub(crate) fn convert_for_loop_to_any_all(checker: &Checker, stmt: &Stmt) { op: UnaryOp::Not, operand: Box::new(loop_.test.clone()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; node.into() } @@ -182,7 +182,7 @@ pub(crate) fn convert_for_loop_to_any_all(checker: &Checker, stmt: &Stmt) { op: UnaryOp::Not, operand: Box::new(loop_.test.clone()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; node.into() } @@ -406,17 +406,17 @@ fn return_stmt(id: Name, test: &Expr, target: &Expr, iter: &Expr, generator: Gen ifs: vec![], is_async: false, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }], range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: false, }; let node1 = ast::ExprName { id, ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let node2 = ast::ExprCall { func: Box::new(node1.into()), @@ -424,15 +424,15 @@ fn return_stmt(id: Name, test: &Expr, target: &Expr, iter: &Expr, generator: Gen args: Box::from([node.into()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let node3 = ast::StmtReturn { value: Some(Box::new(node2.into())), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; generator.stmt(&node3.into()) } diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs index c8a6f46e03..7ab8b12a4f 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs @@ -163,14 +163,14 @@ fn construct_replacement(elts: &[&str], flags: StringLiteralFlags) -> Expr { Expr::from(StringLiteral { value: Box::from(*elt), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, flags: element_flags, }) }) .collect(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }) } diff --git a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs index 1e6ac5e4ca..e88906787b 100644 --- a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs +++ b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs @@ -101,7 +101,7 @@ fn fix_banned_relative_import( names: names.clone(), level: 0, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let content = generator.stmt(&node.into()); Some(Fix::unsafe_edit(Edit::range_replacement( diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs b/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs index 6725e2f4b0..6a78d9d16c 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs +++ b/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs @@ -436,7 +436,7 @@ impl<'a> QuoteAnnotator<'a> { let annotation = subgenerator.expr(&expr_without_forward_references); generator.expr(&Expr::from(ast::StringLiteral { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, value: annotation.into_boxed_str(), flags: self.flags, })) diff --git a/crates/ruff_linter/src/rules/flynt/helpers.rs b/crates/ruff_linter/src/rules/flynt/helpers.rs index 58137a3816..96852d8961 100644 --- a/crates/ruff_linter/src/rules/flynt/helpers.rs +++ b/crates/ruff_linter/src/rules/flynt/helpers.rs @@ -9,7 +9,7 @@ fn to_interpolated_string_interpolation_element(inner: &Expr) -> ast::Interpolat conversion: ConversionFlag::None, format_spec: None, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }) } @@ -18,7 +18,7 @@ pub(super) fn to_interpolated_string_literal_element(s: &str) -> ast::Interpolat ast::InterpolatedStringElement::Literal(ast::InterpolatedStringLiteralElement { value: Box::from(s), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }) } diff --git a/crates/ruff_linter/src/rules/flynt/rules/static_join_to_fstring.rs b/crates/ruff_linter/src/rules/flynt/rules/static_join_to_fstring.rs index 6ac651fb66..a385b910ec 100644 --- a/crates/ruff_linter/src/rules/flynt/rules/static_join_to_fstring.rs +++ b/crates/ruff_linter/src/rules/flynt/rules/static_join_to_fstring.rs @@ -91,7 +91,7 @@ fn build_fstring(joiner: &str, joinees: &[Expr], flags: FStringFlags) -> Option< .into_boxed_str(), flags: flags?, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; return Some(node.into()); } @@ -114,7 +114,7 @@ fn build_fstring(joiner: &str, joinees: &[Expr], flags: FStringFlags) -> Option< let node = ast::FString { elements: f_string_elements.into(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, flags, }; Some(node.into()) diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs index 24c47e1c7c..ba14e1ac19 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs +++ b/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs @@ -182,7 +182,7 @@ fn function( ExprEllipsisLiteral::default(), ))), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); let parameters = lambda.parameters.as_deref().cloned().unwrap_or_default(); if let Some(annotation) = annotation { @@ -230,7 +230,7 @@ fn function( returns: Some(Box::new(return_type)), type_params: None, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); let generated = checker.generator().stmt(&func); @@ -246,7 +246,7 @@ fn function( returns: None, type_params: None, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); let generated = checker.generator().stmt(&function); diff --git a/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs b/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs index 5f5cc9ccc9..c53c3c3ddd 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs @@ -72,11 +72,11 @@ pub(crate) fn manual_from_import(checker: &Checker, stmt: &Stmt, alias: &Alias, name: asname.clone(), asname: None, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }], level: 0, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement( checker.generator().stmt(&node.into()), diff --git a/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs b/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs index b9be519243..8b50510a87 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs @@ -147,7 +147,7 @@ fn collect_nested_args(min_max: MinMax, args: &[Expr], semantic: &SemanticModel) value: Box::new(arg.clone()), ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); new_args.push(new_arg); continue; @@ -204,10 +204,10 @@ pub(crate) fn nested_min_max( args: collect_nested_args(min_max, args, checker.semantic()).into_boxed_slice(), keywords: Box::from(keywords), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( checker.generator().expr(&flattened_expr), diff --git a/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs b/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs index 4ac8f3f79f..c9c0c00e1c 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs @@ -170,13 +170,13 @@ pub(crate) fn repeated_equality_comparison(checker: &Checker, bool_op: &ast::Exp Expr::Set(ast::ExprSet { elts: comparators.iter().copied().cloned().collect(), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } else { Expr::Tuple(ast::ExprTuple { elts: comparators.iter().copied().cloned().collect(), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: true, }) @@ -194,12 +194,12 @@ pub(crate) fn repeated_equality_comparison(checker: &Checker, bool_op: &ast::Exp }, comparators: Box::from([comparator]), range: bool_op.range(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }))) .chain(after) .collect(), range: bool_op.range(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })), bool_op.range(), ))); diff --git a/crates/ruff_linter/src/rules/pylint/rules/unspecified_encoding.rs b/crates/ruff_linter/src/rules/pylint/rules/unspecified_encoding.rs index e6d9e43cc0..a730ffd567 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/unspecified_encoding.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/unspecified_encoding.rs @@ -188,7 +188,7 @@ fn generate_keyword_fix(checker: &Checker, call: &ast::ExprCall) -> Fix { value: Box::from("utf-8"), flags: checker.default_string_flags(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })) ), &call.arguments, diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs index 92f163a575..0974d66bb7 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs @@ -87,7 +87,7 @@ pub(crate) fn convert_named_tuple_functional_to_class( // Ex) `NamedTuple("MyType")` ([_typename], []) => vec![Stmt::Pass(ast::StmtPass { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })], // Ex) `NamedTuple("MyType", [("a", int), ("b", str)])` ([_typename, fields], []) => { @@ -165,7 +165,7 @@ fn create_field_assignment_stmt(field: Name, annotation: &Expr) -> Stmt { id: field, ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(), ), @@ -173,7 +173,7 @@ fn create_field_assignment_stmt(field: Name, annotation: &Expr) -> Stmt { value: None, simple: true, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into() } @@ -184,7 +184,7 @@ fn create_fields_from_fields_arg(fields: &Expr) -> Option> { if fields.is_empty() { let node = Stmt::Pass(ast::StmtPass { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); Some(vec![node]) } else { @@ -236,13 +236,13 @@ fn create_class_def_stmt(typename: &str, body: Vec, base_class: &Expr) -> args: Box::from([base_class.clone()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), body, type_params: None, decorator_list: vec![], range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into() } diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs index 97f1619078..28b4b08a8e 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs @@ -150,7 +150,7 @@ fn create_field_assignment_stmt(field: &str, annotation: &Expr) -> Stmt { id: field.into(), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(), ), @@ -158,7 +158,7 @@ fn create_field_assignment_stmt(field: &str, annotation: &Expr) -> Stmt { value: None, simple: true, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into() } @@ -179,13 +179,13 @@ fn create_class_def_stmt( None => Box::from([]), }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), body, type_params: None, decorator_list: vec![], range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into() } @@ -194,7 +194,7 @@ fn fields_from_dict_literal(items: &[ast::DictItem]) -> Option> { if items.is_empty() { let node = Stmt::Pass(ast::StmtPass { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); Some(vec![node]) } else { @@ -228,7 +228,7 @@ fn fields_from_dict_call(func: &Expr, keywords: &[Keyword]) -> Option> if keywords.is_empty() { let node = Stmt::Pass(ast::StmtPass { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); Some(vec![node]) } else { @@ -241,7 +241,7 @@ fn fields_from_keywords(keywords: &[Keyword]) -> Option> { if keywords.is_empty() { let node = Stmt::Pass(ast::StmtPass { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); return Some(vec![node]); } @@ -282,7 +282,7 @@ fn match_fields_and_total(arguments: &Arguments) -> Option<(Vec, Option<&K ([_typename], []) => { let node = Stmt::Pass(ast::StmtPass { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); Some((vec![node], None)) } diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs index 4b2bbb1068..0f1a301f19 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs @@ -39,27 +39,27 @@ impl LiteralType { LiteralType::Str => ast::StringLiteral { value: Box::default(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, flags: checker.default_string_flags(), } .into(), LiteralType::Bytes => ast::BytesLiteral { value: Box::default(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, flags: checker.default_bytes_flags(), } .into(), LiteralType::Int => ast::ExprNumberLiteral { value: ast::Number::Int(Int::from(0u8)), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(), LiteralType::Float => ast::ExprNumberLiteral { value: ast::Number::Float(0.0), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(), LiteralType::Bool => ast::ExprBooleanLiteral::default().into(), diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs index c08a49462f..aeb01069f9 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs @@ -116,7 +116,7 @@ fn tuple_diagnostic(checker: &Checker, tuple: &ast::ExprTuple, aliases: &[&Expr] id: Name::new_static("OSError"), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; remaining.insert(0, node.into()); } @@ -128,7 +128,7 @@ fn tuple_diagnostic(checker: &Checker, tuple: &ast::ExprTuple, aliases: &[&Expr] elts: remaining, ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, }; format!("({})", checker.generator().expr(&node.into())) diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs index e364056de3..41ae88289f 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs @@ -140,14 +140,14 @@ impl<'a> From<&'a TypeVar<'a>> for TypeParam { TypeParamKind::TypeVar => { TypeParam::TypeVar(TypeParamTypeVar { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, name: Identifier::new(*name, TextRange::default()), bound: match restriction { Some(TypeVarRestriction::Bound(bound)) => Some(Box::new((*bound).clone())), Some(TypeVarRestriction::Constraint(constraints)) => { Some(Box::new(Expr::Tuple(ast::ExprTuple { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, elts: constraints.iter().map(|expr| (*expr).clone()).collect(), ctx: ast::ExprContext::Load, parenthesized: true, @@ -156,17 +156,17 @@ impl<'a> From<&'a TypeVar<'a>> for TypeParam { Some(TypeVarRestriction::AnyStr) => { Some(Box::new(Expr::Tuple(ast::ExprTuple { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, elts: vec![ Expr::Name(ExprName { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, id: Name::from("str"), ctx: ast::ExprContext::Load, }), Expr::Name(ExprName { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, id: Name::from("bytes"), ctx: ast::ExprContext::Load, }), @@ -184,13 +184,13 @@ impl<'a> From<&'a TypeVar<'a>> for TypeParam { } TypeParamKind::TypeVarTuple => TypeParam::TypeVarTuple(TypeParamTypeVarTuple { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, name: Identifier::new(*name, TextRange::default()), default: None, }), TypeParamKind::ParamSpec => TypeParam::ParamSpec(TypeParamParamSpec { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, name: Identifier::new(*name, TextRange::default()), default: None, }), diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs index c5c2e609b6..eadfdf8eb8 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs @@ -130,7 +130,7 @@ fn tuple_diagnostic(checker: &Checker, tuple: &ast::ExprTuple, aliases: &[&Expr] id: Name::new_static("TimeoutError"), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; remaining.insert(0, node.into()); } @@ -142,7 +142,7 @@ fn tuple_diagnostic(checker: &Checker, tuple: &ast::ExprTuple, aliases: &[&Expr] elts: remaining, ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, }; format!("({})", checker.generator().expr(&node.into())) diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs index ed1cba9f53..1bfebfe727 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs @@ -127,13 +127,13 @@ pub(crate) fn unnecessary_default_type_args(checker: &Checker, expr: &Expr) { elts: valid_elts, ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, }) }), ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), expr.range(), ), diff --git a/crates/ruff_linter/src/rules/refurb/helpers.rs b/crates/ruff_linter/src/rules/refurb/helpers.rs index 0c6749af8c..90a624a055 100644 --- a/crates/ruff_linter/src/rules/refurb/helpers.rs +++ b/crates/ruff_linter/src/rules/refurb/helpers.rs @@ -17,7 +17,7 @@ pub(super) fn generate_method_call(name: Name, method: &str, generator: Generato id: name, ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; // Construct `name.method`. let attr = ast::ExprAttribute { @@ -25,7 +25,7 @@ pub(super) fn generate_method_call(name: Name, method: &str, generator: Generato attr: ast::Identifier::new(method.to_string(), TextRange::default()), ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; // Make it into a call `name.method()` let call = ast::ExprCall { @@ -34,16 +34,16 @@ pub(super) fn generate_method_call(name: Name, method: &str, generator: Generato args: Box::from([]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; // And finally, turn it into a statement. let stmt = ast::StmtExpr { value: Box::new(call.into()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; generator.stmt(&stmt.into()) } @@ -69,7 +69,7 @@ pub(super) fn replace_with_identity_check( ops: [op].into(), comparators: [ast::ExprNoneLiteral::default().into()].into(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); let new_content = generator.expr(&new_expr); diff --git a/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs b/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs index ed2494f24b..7aa11f94ba 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs @@ -185,7 +185,7 @@ fn make_suggestion(set: &ast::ExprName, element: &Expr, generator: Generator) -> attr: ast::Identifier::new("discard".to_string(), TextRange::default()), ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; // Make the actual call `set.discard(element)` let call = ast::ExprCall { @@ -194,16 +194,16 @@ fn make_suggestion(set: &ast::ExprName, element: &Expr, generator: Generator) -> args: Box::from([element.clone()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; // And finally, turn it into a statement. let stmt = ast::StmtExpr { value: Box::new(call.into()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; generator.stmt(&stmt.into()) } diff --git a/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs b/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs index cb18f0ff90..af21f4f247 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs @@ -130,7 +130,7 @@ fn make_suggestion(open: &FileOpen<'_>, generator: Generator) -> SourceCodeSnipp id: open.mode.pathlib_method(), ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let call = ast::ExprCall { func: Box::new(name.into()), @@ -138,10 +138,10 @@ fn make_suggestion(open: &FileOpen<'_>, generator: Generator) -> SourceCodeSnipp args: Box::from([]), keywords: open.keywords.iter().copied().cloned().collect(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; SourceCodeSnippet::from_str(&generator.expr(&call.into())) } diff --git a/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs b/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs index 874e6620d2..592d7fb759 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs @@ -298,7 +298,7 @@ fn construct_starmap_call(starmap_binding: Name, iter: &Expr, func: &Expr) -> as id: starmap_binding, ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; ast::ExprCall { func: Box::new(starmap.into()), @@ -306,10 +306,10 @@ fn construct_starmap_call(starmap_binding: Name, iter: &Expr, func: &Expr) -> as args: Box::from([func.clone(), iter.clone()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } } @@ -319,7 +319,7 @@ fn wrap_with_call_to(call: ast::ExprCall, func_name: Name) -> ast::ExprCall { id: func_name, ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; ast::ExprCall { func: Box::new(name.into()), @@ -327,10 +327,10 @@ fn wrap_with_call_to(call: ast::ExprCall, func_name: Name) -> ast::ExprCall { args: Box::from([call.into()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } } diff --git a/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs b/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs index d3c8259ec9..aaf7e88831 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs @@ -342,7 +342,7 @@ fn make_suggestion(group: &AppendGroup, generator: Generator) -> String { elts, ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, }; // Make `var.extend`. @@ -352,7 +352,7 @@ fn make_suggestion(group: &AppendGroup, generator: Generator) -> String { attr: ast::Identifier::new("extend".to_string(), TextRange::default()), ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; // Make the actual call `var.extend((elt1, elt2, ..., eltN))` let call = ast::ExprCall { @@ -361,16 +361,16 @@ fn make_suggestion(group: &AppendGroup, generator: Generator) -> String { args: Box::from([tuple.into()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; // And finally, turn it into a statement. let stmt = ast::StmtExpr { value: Box::new(call.into()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; generator.stmt(&stmt.into()) } diff --git a/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs b/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs index db8e3fb1c3..4d3ab82689 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs @@ -232,7 +232,7 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String { id: name, ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; // Construct `len(name)`. let len = ast::ExprCall { @@ -241,7 +241,7 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String { id: Name::new_static("len"), ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(), ), @@ -249,10 +249,10 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String { args: Box::from([var.into()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; // Construct `range(len(name))`. let range = ast::ExprCall { @@ -261,7 +261,7 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String { id: Name::new_static("range"), ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(), ), @@ -269,16 +269,16 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String { args: Box::from([len.into()]), keywords: Box::from([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; // And finally, turn it into a statement. let stmt = ast::StmtExpr { value: Box::new(range.into()), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; generator.stmt(&stmt.into()) } diff --git a/crates/ruff_linter/src/rules/refurb/rules/write_whole_file.rs b/crates/ruff_linter/src/rules/refurb/rules/write_whole_file.rs index 2440f4236c..ab3a3f2480 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/write_whole_file.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/write_whole_file.rs @@ -148,7 +148,7 @@ fn make_suggestion(open: &FileOpen<'_>, arg: &Expr, generator: Generator) -> Sou id: open.mode.pathlib_method(), ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let mut arg = arg.clone(); relocate_expr(&mut arg, TextRange::default()); @@ -158,10 +158,10 @@ fn make_suggestion(open: &FileOpen<'_>, arg: &Expr, generator: Generator) -> Sou args: Box::new([arg]), keywords: open.keywords.iter().copied().cloned().collect(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; SourceCodeSnippet::from_str(&generator.expr(&call.into())) } diff --git a/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs b/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs index 41f72bbdc5..2d34e63a0c 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs @@ -68,7 +68,7 @@ pub(crate) fn assert_with_print_message(checker: &Checker, stmt: &ast::StmtAsser test: stmt.test.clone(), msg: print_arguments::to_expr(&call.arguments, checker).map(Box::new), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), // We have to replace the entire statement, // as the `print` could be empty and thus `call.range()` @@ -114,7 +114,7 @@ mod print_arguments { InterpolatedStringElement::Literal(InterpolatedStringLiteralElement { value: part.value.clone(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }) }) .collect(), @@ -131,7 +131,7 @@ mod print_arguments { conversion: ConversionFlag::None, format_spec: None, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, )], } @@ -154,7 +154,7 @@ mod print_arguments { value: literal.value.clone(), flags, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); Some(acc) } else { @@ -212,7 +212,7 @@ mod print_arguments { value: combined_string.into(), flags, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })) } @@ -246,10 +246,10 @@ mod print_arguments { elements: InterpolatedStringElements::from(fstring_elements), flags, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })) } @@ -285,7 +285,7 @@ mod print_arguments { vec![InterpolatedStringElement::Literal( InterpolatedStringLiteralElement { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, value: " ".into(), }, )] diff --git a/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs b/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs index f8cd2b9c36..8c38154151 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs @@ -78,7 +78,7 @@ fn make_splat_elts( value: Box::from(splat_element.clone()), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; let splat = node.into(); if splat_at_left { @@ -166,14 +166,14 @@ fn concatenate_expressions(expr: &Expr) -> Option<(Expr, Type)> { elts: new_elts, ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, } .into(), Type::Tuple => ast::ExprTuple { elts: new_elts, ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, } .into(), diff --git a/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs b/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs index 83c0065d8b..35294f2843 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs @@ -140,7 +140,7 @@ fn generate_fix(checker: &Checker, conversion_type: ConversionType, expr: &Expr) op: Operator::BitOr, right: Box::new(Expr::NoneLiteral(ast::ExprNoneLiteral::default())), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); let content = checker.generator().expr(&new_expr); let edit = Edit::range_replacement(content, expr.range()); @@ -160,12 +160,12 @@ fn generate_fix(checker: &Checker, conversion_type: ConversionType, expr: &Expr) let (import_edit, binding) = importer.import(expr.start())?; let new_expr = Expr::Subscript(ast::ExprSubscript { range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, value: Box::new(Expr::Name(ast::ExprName { id: Name::new(binding), ctx: ast::ExprContext::Store, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })), slice: Box::new(expr.clone()), ctx: ast::ExprContext::Load, diff --git a/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs b/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs index 5dc94542da..4e7081a6b4 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs @@ -245,16 +245,16 @@ fn generate_with_statement( }); let context_call = ast::ExprCall { - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, range: TextRange::default(), func: legacy_call.func.clone(), arguments: ast::Arguments { - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, range: TextRange::default(), args: expected.cloned().as_slice().into(), keywords: match_arg .map(|expr| ast::Keyword { - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, // Take range from the original expression so that the keyword // argument is generated after positional arguments range: expr.range(), @@ -267,11 +267,11 @@ fn generate_with_statement( }; let func_call = ast::ExprCall { - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, range: TextRange::default(), func: Box::new(func.clone()), arguments: ast::Arguments { - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, range: TextRange::default(), args: func_args.into(), keywords: func_keywords.into(), @@ -280,25 +280,25 @@ fn generate_with_statement( let body = if let Some(assign_targets) = assign_targets { Stmt::Assign(ast::StmtAssign { - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, range: TextRange::default(), targets: assign_targets.to_vec(), value: Box::new(func_call.into()), }) } else { Stmt::Expr(StmtExpr { - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, range: TextRange::default(), value: Box::new(func_call.into()), }) }; Some(StmtWith { - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, range: TextRange::default(), is_async: false, items: vec![WithItem { - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, range: TextRange::default(), context_expr: context_call.into(), optional_vars: optional_vars.map(|var| Box::new(var.clone())), diff --git a/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs b/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs index 5b60d38c1a..eea779a30e 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs @@ -102,7 +102,7 @@ fn generate_dict_comprehension(keys: &Expr, value: &Expr, generator: Generator) id: Name::new_static("key"), ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; // Construct `key in keys`. let comp = ast::Comprehension { @@ -110,7 +110,7 @@ fn generate_dict_comprehension(keys: &Expr, value: &Expr, generator: Generator) iter: keys.clone(), ifs: vec![], range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, is_async: false, }; // Construct the dict comprehension. @@ -119,7 +119,7 @@ fn generate_dict_comprehension(keys: &Expr, value: &Expr, generator: Generator) value: Box::new(value.clone()), generators: vec![comp], range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }; generator.expr(&dict_comp.into()) } diff --git a/crates/ruff_linter/src/rules/ruff/rules/never_union.rs b/crates/ruff_linter/src/rules/ruff/rules/never_union.rs index 8be1156a0a..c06c054502 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/never_union.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/never_union.rs @@ -164,12 +164,12 @@ pub(crate) fn never_union(checker: &Checker, expr: &Expr) { elts: rest, ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, })), ctx: ast::ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, })) }, expr.range(), diff --git a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs index 8e815c601b..91d384560b 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs @@ -116,14 +116,14 @@ pub(crate) fn unnecessary_nested_literal<'a>(checker: &Checker, literal_expr: &' Expr::Tuple(ExprTuple { elts: nodes.into_iter().cloned().collect(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: false, }) }), value: subscript.value.clone(), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, }); let fix = Fix::applicable_edit( diff --git a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs index 3b9c1a4673..48f2efb2cc 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs @@ -303,7 +303,7 @@ impl<'a> ReFunc<'a> { op: UnaryOp::Not, operand: Box::new(expr), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); Some(negated_expr) } @@ -327,7 +327,7 @@ impl<'a> ReFunc<'a> { ops: Box::new([op]), comparators: Box::new([right.clone()]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }) } @@ -339,7 +339,7 @@ impl<'a> ReFunc<'a> { attr: Identifier::new(method, TextRange::default()), ctx: ExprContext::Load, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }); Expr::Call(ExprCall { func: Box::new(method), @@ -347,10 +347,10 @@ impl<'a> ReFunc<'a> { args: args.into_boxed_slice(), keywords: Box::new([]), range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }, range: TextRange::default(), - node_index: ruff_python_ast::AtomicNodeIndex::dummy(), + node_index: ruff_python_ast::AtomicNodeIndex::NONE, }) } } diff --git a/crates/ruff_python_ast/src/helpers.rs b/crates/ruff_python_ast/src/helpers.rs index 81787601b3..bc1195d347 100644 --- a/crates/ruff_python_ast/src/helpers.rs +++ b/crates/ruff_python_ast/src/helpers.rs @@ -1489,7 +1489,7 @@ pub fn pep_604_optional(expr: &Expr) -> Expr { op: Operator::BitOr, right: Box::new(Expr::NoneLiteral(ast::ExprNoneLiteral::default())), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } .into() } @@ -1501,7 +1501,7 @@ pub fn pep_604_union(elts: &[Expr]) -> Expr { elts: vec![], ctx: ExprContext::Load, range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, parenthesized: true, }), [Expr::Tuple(ast::ExprTuple { elts, .. })] => pep_604_union(elts), @@ -1511,7 +1511,7 @@ pub fn pep_604_union(elts: &[Expr]) -> Expr { op: Operator::BitOr, right: Box::new(pep_604_union(std::slice::from_ref(elt))), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }), } } @@ -1522,13 +1522,13 @@ pub fn typing_optional(elt: Expr, binding: Name) -> Expr { value: Box::new(Expr::Name(ast::ExprName { id: binding, range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, ctx: ExprContext::Load, })), slice: Box::new(elt), ctx: ExprContext::Load, range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } @@ -1541,19 +1541,19 @@ pub fn typing_union(elts: &[Expr], binding: Name) -> Expr { value: Box::new(Expr::Name(ast::ExprName { id: binding, range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, ctx: ExprContext::Load, })), slice: Box::new(Expr::Tuple(ast::ExprTuple { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, elts: elts.to_vec(), ctx: ExprContext::Load, parenthesized: false, })), ctx: ExprContext::Load, range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } @@ -1686,34 +1686,34 @@ mod tests { let name = Expr::Name(ExprName { id: "x".into(), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, ctx: ExprContext::Load, }); let constant_one = Expr::NumberLiteral(ExprNumberLiteral { value: Number::Int(Int::from(1u8)), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); let constant_two = Expr::NumberLiteral(ExprNumberLiteral { value: Number::Int(Int::from(2u8)), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); let constant_three = Expr::NumberLiteral(ExprNumberLiteral { value: Number::Int(Int::from(3u8)), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); let type_var_one = TypeParam::TypeVar(TypeParamTypeVar { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, bound: Some(Box::new(constant_one.clone())), default: None, name: Identifier::new("x", TextRange::default()), }); let type_var_two = TypeParam::TypeVar(TypeParamTypeVar { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, bound: None, default: Some(Box::new(constant_two.clone())), name: Identifier::new("x", TextRange::default()), @@ -1723,11 +1723,11 @@ mod tests { type_params: Some(Box::new(TypeParams { type_params: vec![type_var_one, type_var_two], range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })), value: Box::new(constant_three.clone()), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); assert!(!any_over_stmt(&type_alias, &|expr| { seen.borrow_mut().push(expr.clone()); @@ -1743,7 +1743,7 @@ mod tests { fn any_over_type_param_type_var() { let type_var_no_bound = TypeParam::TypeVar(TypeParamTypeVar { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, bound: None, default: None, name: Identifier::new("x", TextRange::default()), @@ -1753,12 +1753,12 @@ mod tests { let constant = Expr::NumberLiteral(ExprNumberLiteral { value: Number::Int(Int::ONE), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); let type_var_with_bound = TypeParam::TypeVar(TypeParamTypeVar { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, bound: Some(Box::new(constant.clone())), default: None, name: Identifier::new("x", TextRange::default()), @@ -1776,7 +1776,7 @@ mod tests { let type_var_with_default = TypeParam::TypeVar(TypeParamTypeVar { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, default: Some(Box::new(constant.clone())), bound: None, name: Identifier::new("x", TextRange::default()), @@ -1797,7 +1797,7 @@ mod tests { fn any_over_type_param_type_var_tuple() { let type_var_tuple = TypeParam::TypeVarTuple(TypeParamTypeVarTuple { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, name: Identifier::new("x", TextRange::default()), default: None, }); @@ -1809,12 +1809,12 @@ mod tests { let constant = Expr::NumberLiteral(ExprNumberLiteral { value: Number::Int(Int::ONE), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); let type_var_tuple_with_default = TypeParam::TypeVarTuple(TypeParamTypeVarTuple { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, default: Some(Box::new(constant.clone())), name: Identifier::new("x", TextRange::default()), }); @@ -1834,7 +1834,7 @@ mod tests { fn any_over_type_param_param_spec() { let type_param_spec = TypeParam::ParamSpec(TypeParamParamSpec { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, name: Identifier::new("x", TextRange::default()), default: None, }); @@ -1846,12 +1846,12 @@ mod tests { let constant = Expr::NumberLiteral(ExprNumberLiteral { value: Number::Int(Int::ONE), range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); let param_spec_with_default = TypeParam::TypeVarTuple(TypeParamTypeVarTuple { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, default: Some(Box::new(constant.clone())), name: Identifier::new("x", TextRange::default()), }); diff --git a/crates/ruff_python_ast/src/node_index.rs b/crates/ruff_python_ast/src/node_index.rs index cb8042b04d..d40a7fc2bb 100644 --- a/crates/ruff_python_ast/src/node_index.rs +++ b/crates/ruff_python_ast/src/node_index.rs @@ -1,3 +1,4 @@ +use std::num::NonZeroU32; use std::sync::atomic::{AtomicU32, Ordering}; /// An AST node that has an index. @@ -16,64 +17,82 @@ where } /// A unique index for a node within an AST. -/// -/// This type is interiorly mutable to allow assigning node indices -/// on-demand after parsing. -#[derive(Default)] +#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash)] #[cfg_attr(feature = "get-size", derive(get_size2::GetSize))] -pub struct AtomicNodeIndex(AtomicU32); - -impl AtomicNodeIndex { - /// Returns a placeholder `AtomicNodeIndex`. - pub const fn dummy() -> AtomicNodeIndex { - AtomicNodeIndex(AtomicU32::new(u32::MAX)) - } - - /// Load the current value of the `AtomicNodeIndex`. - pub fn load(&self) -> NodeIndex { - NodeIndex(self.0.load(Ordering::Relaxed)) - } - - /// Set the value of the `AtomicNodeIndex`. - pub fn set(&self, value: u32) { - self.0.store(value, Ordering::Relaxed); - } -} - -/// A unique index for a node within an AST. -#[derive(PartialEq, Eq, Debug, PartialOrd, Ord, Clone, Copy, Hash)] -#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))] -pub struct NodeIndex(u32); +pub struct NodeIndex(NonZeroU32); impl NodeIndex { - pub fn as_usize(self) -> usize { - self.0 as _ - } + /// A placeholder `NodeIndex`. + pub const NONE: NodeIndex = NodeIndex(NonZeroU32::new(NodeIndex::_NONE).unwrap()); - pub fn as_u32(self) -> u32 { - self.0 + // Note that the index `u32::MAX` is reserved for the `NonZeroU32` niche, and + // this placeholder also reserves the second highest index. + const _NONE: u32 = u32::MAX - 1; + + /// Returns the index as a `u32`. or `None` for `NodeIndex::NONE`. + pub fn as_u32(self) -> Option { + if self == NodeIndex::NONE { + None + } else { + Some(self.0.get() - 1) + } } } impl From for NodeIndex { fn from(value: u32) -> Self { - NodeIndex(value) + match NonZeroU32::new(value + 1).map(NodeIndex) { + None | Some(NodeIndex::NONE) => panic!("exceeded maximum `NodeIndex`"), + Some(index) => index, + } } } -impl From for AtomicNodeIndex { - fn from(value: u32) -> Self { - AtomicNodeIndex(AtomicU32::from(value)) +impl std::fmt::Debug for NodeIndex { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + if *self == Self::NONE { + f.debug_tuple("NodeIndex(None)").finish() + } else { + f.debug_tuple("NodeIndex").field(&self.0).finish() + } + } +} + +/// A unique index for a node within an AST. +/// +/// This type is interiorly mutable to allow assigning node indices +/// on-demand after parsing. +#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))] +pub struct AtomicNodeIndex(AtomicU32); + +#[allow(clippy::declare_interior_mutable_const)] +impl AtomicNodeIndex { + /// A placeholder `AtomicNodeIndex`. + pub const NONE: AtomicNodeIndex = AtomicNodeIndex(AtomicU32::new(NodeIndex::_NONE)); + + /// Load the current value of the `AtomicNodeIndex`. + pub fn load(&self) -> NodeIndex { + let index = NonZeroU32::new(self.0.load(Ordering::Relaxed)) + .expect("value stored was a valid `NodeIndex`"); + + NodeIndex(index) + } + + /// Set the value of the `AtomicNodeIndex`. + pub fn set(&self, index: NodeIndex) { + self.0.store(index.0.get(), Ordering::Relaxed); + } +} + +impl Default for AtomicNodeIndex { + fn default() -> Self { + Self::NONE } } impl std::fmt::Debug for AtomicNodeIndex { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - if *self == AtomicNodeIndex::dummy() { - f.debug_tuple("AtomicNodeIndex").finish_non_exhaustive() - } else { - f.debug_tuple("AtomicNodeIndex").field(&self.0).finish() - } + std::fmt::Debug::fmt(&self.load(), f) } } @@ -108,3 +127,26 @@ impl Clone for AtomicNodeIndex { Self(AtomicU32::from(self.0.load(Ordering::Relaxed))) } } + +#[cfg(test)] +mod tests { + use super::{AtomicNodeIndex, NodeIndex}; + + #[test] + fn test_node_index() { + let index = AtomicNodeIndex::NONE; + + assert_eq!(index.load(), NodeIndex::NONE); + assert_eq!(format!("{index:?}"), "NodeIndex(None)"); + + index.set(NodeIndex::from(1)); + assert_eq!(index.load(), NodeIndex::from(1)); + assert_eq!(index.load().as_u32(), Some(1)); + + let index = NodeIndex::from(0); + assert_eq!(index.as_u32(), Some(0)); + + let index = NodeIndex::NONE; + assert_eq!(index.as_u32(), None); + } +} diff --git a/crates/ruff_python_ast/src/nodes.rs b/crates/ruff_python_ast/src/nodes.rs index 6de571a86e..6a824603bb 100644 --- a/crates/ruff_python_ast/src/nodes.rs +++ b/crates/ruff_python_ast/src/nodes.rs @@ -1602,7 +1602,7 @@ impl StringLiteral { Self { range, value: "".into(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, flags: StringLiteralFlags::empty().with_invalid(), } } @@ -1622,7 +1622,7 @@ impl From for Expr { fn from(payload: StringLiteral) -> Self { ExprStringLiteral { range: payload.range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, value: StringLiteralValue::single(payload), } .into() @@ -2001,7 +2001,7 @@ impl BytesLiteral { Self { range, value: Box::new([]), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, flags: BytesLiteralFlags::empty().with_invalid(), } } @@ -2011,7 +2011,7 @@ impl From for Expr { fn from(payload: BytesLiteral) -> Self { ExprBytesLiteral { range: payload.range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, value: BytesLiteralValue::single(payload), } .into() @@ -3545,7 +3545,7 @@ impl Identifier { pub fn new(id: impl Into, range: TextRange) -> Self { Self { id: id.into(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, range, } } diff --git a/crates/ruff_python_formatter/src/comments/debug.rs b/crates/ruff_python_formatter/src/comments/debug.rs index 8cd374464f..3e4ae7c6bd 100644 --- a/crates/ruff_python_formatter/src/comments/debug.rs +++ b/crates/ruff_python_formatter/src/comments/debug.rs @@ -196,12 +196,12 @@ mod tests { fn debug() { let continue_statement = StmtContinue { range: TextRange::new(TextSize::new(18), TextSize::new(26)), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }; let break_statement = StmtBreak { range: TextRange::new(TextSize::new(55), TextSize::new(60)), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }; let source = r"# leading comment diff --git a/crates/ruff_python_formatter/src/comments/node_key.rs b/crates/ruff_python_formatter/src/comments/node_key.rs index 4d94ebe092..ec15ced488 100644 --- a/crates/ruff_python_formatter/src/comments/node_key.rs +++ b/crates/ruff_python_formatter/src/comments/node_key.rs @@ -69,7 +69,7 @@ mod tests { fn equality() { let continue_statement = StmtContinue { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }; let ref_a = NodeRefEqualityKey::from_ref(AnyNodeRef::from(&continue_statement)); @@ -83,7 +83,7 @@ mod tests { fn inequality() { let continue_statement = StmtContinue { range: TextRange::default(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }; let boxed = Box::new(continue_statement.clone()); diff --git a/crates/ruff_python_formatter/tests/normalizer.rs b/crates/ruff_python_formatter/tests/normalizer.rs index e5237f8c5f..2b943948eb 100644 --- a/crates/ruff_python_formatter/tests/normalizer.rs +++ b/crates/ruff_python_formatter/tests/normalizer.rs @@ -82,7 +82,7 @@ impl Transformer for Normalizer { value: Box::from(string.value.to_str()), range: string.range, flags: StringLiteralFlags::empty(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } } @@ -99,7 +99,7 @@ impl Transformer for Normalizer { value: bytes.value.bytes().collect(), range: bytes.range, flags: BytesLiteralFlags::empty(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } } @@ -143,7 +143,7 @@ impl Transformer for Normalizer { InterpolatedStringLiteralElement { range, value: literal.into(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }, )); } @@ -185,7 +185,7 @@ impl Transformer for Normalizer { elements: collector.elements.into(), range: fstring.range, flags: FStringFlags::empty(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } } diff --git a/crates/ruff_python_parser/src/lib.rs b/crates/ruff_python_parser/src/lib.rs index c25eea290c..46cc082945 100644 --- a/crates/ruff_python_parser/src/lib.rs +++ b/crates/ruff_python_parser/src/lib.rs @@ -215,7 +215,7 @@ pub fn parse_parenthesized_expression_range( /// value: "'''\n int | str'''".to_string().into_boxed_str(), /// flags: StringLiteralFlags::empty(), /// range: TextRange::new(TextSize::new(0), TextSize::new(16)), -/// node_index: AtomicNodeIndex::dummy() +/// node_index: AtomicNodeIndex::NONE /// }; /// let parsed = parse_string_annotation("'''\n int | str'''", &string); /// assert!(!parsed.is_ok()); diff --git a/crates/ruff_python_parser/src/parser/expression.rs b/crates/ruff_python_parser/src/parser/expression.rs index de9a1bad52..d198441895 100644 --- a/crates/ruff_python_parser/src/parser/expression.rs +++ b/crates/ruff_python_parser/src/parser/expression.rs @@ -304,7 +304,7 @@ impl<'src> Parser<'src> { op: bin_op, right: Box::new(right.expr), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } }; @@ -472,7 +472,7 @@ impl<'src> Parser<'src> { range: identifier.range, id: identifier.id, ctx, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -491,7 +491,7 @@ impl<'src> Parser<'src> { return ast::Identifier { id: name, range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }; } @@ -501,7 +501,7 @@ impl<'src> Parser<'src> { return ast::Identifier { id, range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }; } @@ -520,7 +520,7 @@ impl<'src> Parser<'src> { ast::Identifier { id, range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } else { self.add_error( @@ -531,7 +531,7 @@ impl<'src> Parser<'src> { ast::Identifier { id: Name::empty(), range: self.missing_node_range(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } } @@ -551,7 +551,7 @@ impl<'src> Parser<'src> { Expr::NumberLiteral(ast::ExprNumberLiteral { value: Number::Float(value), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::Complex => { @@ -561,7 +561,7 @@ impl<'src> Parser<'src> { Expr::NumberLiteral(ast::ExprNumberLiteral { value: Number::Complex { real, imag }, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::Int => { @@ -571,7 +571,7 @@ impl<'src> Parser<'src> { Expr::NumberLiteral(ast::ExprNumberLiteral { value: Number::Int(value), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::True => { @@ -579,7 +579,7 @@ impl<'src> Parser<'src> { Expr::BooleanLiteral(ast::ExprBooleanLiteral { value: true, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::False => { @@ -587,21 +587,21 @@ impl<'src> Parser<'src> { Expr::BooleanLiteral(ast::ExprBooleanLiteral { value: false, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::None => { self.bump(TokenKind::None); Expr::NoneLiteral(ast::ExprNoneLiteral { range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::Ellipsis => { self.bump(TokenKind::Ellipsis); Expr::EllipsisLiteral(ast::ExprEllipsisLiteral { range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::Name => Expr::Name(self.parse_name()), @@ -629,7 +629,7 @@ impl<'src> Parser<'src> { range: self.missing_node_range(), id: Name::empty(), ctx: ExprContext::Invalid, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } } @@ -672,7 +672,7 @@ impl<'src> Parser<'src> { func: Box::new(func), arguments, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -702,7 +702,7 @@ impl<'src> Parser<'src> { arg: None, value: value.expr, range: parser.node_range(argument_start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); seen_keyword_unpacking = true; @@ -767,7 +767,7 @@ impl<'src> Parser<'src> { ast::Identifier { id: ident_expr.id, range: ident_expr.range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } else { // TODO(dhruvmanila): Parser shouldn't drop the `parsed_expr` if it's @@ -780,7 +780,7 @@ impl<'src> Parser<'src> { ast::Identifier { id: Name::empty(), range: parsed_expr.range(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } }; @@ -790,7 +790,7 @@ impl<'src> Parser<'src> { arg: Some(arg), value: value.expr, range: parser.node_range(argument_start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } else { if !parsed_expr.is_unparenthesized_starred_expr() { @@ -815,7 +815,7 @@ impl<'src> Parser<'src> { let arguments = ast::Arguments { range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, args: args.into_boxed_slice(), keywords: keywords.into_boxed_slice(), }; @@ -857,11 +857,11 @@ impl<'src> Parser<'src> { range: slice_range, id: Name::empty(), ctx: ExprContext::Invalid, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })), ctx: ExprContext::Load, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }; } @@ -881,7 +881,7 @@ impl<'src> Parser<'src> { ctx: ExprContext::Load, range: self.node_range(slice_start), parenthesized: false, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } else if slice.is_starred_expr() { // If the only slice element is a starred expression, that is represented @@ -892,7 +892,7 @@ impl<'src> Parser<'src> { ctx: ExprContext::Load, range: self.node_range(slice_start), parenthesized: false, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } @@ -941,7 +941,7 @@ impl<'src> Parser<'src> { slice: Box::new(slice), ctx: ExprContext::Load, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1035,7 +1035,7 @@ impl<'src> Parser<'src> { Expr::Slice(ast::ExprSlice { range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, lower, upper, step, @@ -1066,7 +1066,7 @@ impl<'src> Parser<'src> { op, operand: Box::new(operand.expr), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1091,7 +1091,7 @@ impl<'src> Parser<'src> { attr, ctx: ExprContext::Load, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1135,7 +1135,7 @@ impl<'src> Parser<'src> { values, op, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1215,7 +1215,7 @@ impl<'src> Parser<'src> { ops: operators.into_boxed_slice(), comparators: comparators.into_boxed_slice(), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1285,22 +1285,22 @@ impl<'src> Parser<'src> { StringType::Str(string) => Expr::StringLiteral(ast::ExprStringLiteral { value: ast::StringLiteralValue::single(string), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }), StringType::Bytes(bytes) => Expr::BytesLiteral(ast::ExprBytesLiteral { value: ast::BytesLiteralValue::single(bytes), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }), StringType::FString(fstring) => Expr::FString(ast::ExprFString { value: ast::FStringValue::single(fstring), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }), StringType::TString(tstring) => Expr::TString(ast::ExprTString { value: ast::TStringValue::single(tstring), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }), }, _ => self.handle_implicitly_concatenated_strings(strings, range), @@ -1367,7 +1367,7 @@ impl<'src> Parser<'src> { return Expr::from(ast::ExprBytesLiteral { value: ast::BytesLiteralValue::concatenated(values), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } } @@ -1395,7 +1395,7 @@ impl<'src> Parser<'src> { return Expr::from(ast::ExprTString { value: ast::TStringValue::concatenated(values), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } } @@ -1433,7 +1433,7 @@ impl<'src> Parser<'src> { return Expr::from(ast::ExprStringLiteral { value: ast::StringLiteralValue::concatenated(values), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } @@ -1457,7 +1457,7 @@ impl<'src> Parser<'src> { Expr::from(ast::ExprFString { value: ast::FStringValue::concatenated(parts), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } @@ -1493,7 +1493,7 @@ impl<'src> Parser<'src> { value: Box::new([]), range, flags: ast::BytesLiteralFlags::from(flags).with_invalid(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } else { // test_err invalid_string_literal @@ -1503,7 +1503,7 @@ impl<'src> Parser<'src> { value: "".into(), range, flags: ast::StringLiteralFlags::from(flags).with_invalid(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } } @@ -1677,7 +1677,7 @@ impl<'src> Parser<'src> { ast::InterpolatedStringLiteralElement { value: "".into(), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } }), ) @@ -1846,7 +1846,7 @@ impl<'src> Parser<'src> { Some(Box::new(ast::InterpolatedStringFormatSpec { range: self.node_range(spec_start), elements, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })) } else { None @@ -1898,7 +1898,7 @@ impl<'src> Parser<'src> { conversion, format_spec, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1928,7 +1928,7 @@ impl<'src> Parser<'src> { elts: vec![], ctx: ExprContext::Load, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } @@ -1980,7 +1980,7 @@ impl<'src> Parser<'src> { return Expr::Dict(ast::ExprDict { items: vec![], range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } @@ -2091,7 +2091,7 @@ impl<'src> Parser<'src> { elts: vec![], ctx: ExprContext::Load, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, parenthesized: true, }) .into(); @@ -2180,7 +2180,7 @@ impl<'src> Parser<'src> { elts, ctx: ExprContext::Load, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, parenthesized: parenthesized.is_yes(), } } @@ -2209,7 +2209,7 @@ impl<'src> Parser<'src> { elts, ctx: ExprContext::Load, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2258,7 +2258,7 @@ impl<'src> Parser<'src> { ast::ExprSet { range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, elts, } } @@ -2301,7 +2301,7 @@ impl<'src> Parser<'src> { ast::ExprDict { range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, items, } } @@ -2369,7 +2369,7 @@ impl<'src> Parser<'src> { ast::Comprehension { range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, target: target.expr, iter: iter.expr, ifs, @@ -2399,7 +2399,7 @@ impl<'src> Parser<'src> { elt: Box::new(element), generators, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, parenthesized: parenthesized.is_yes(), } } @@ -2420,7 +2420,7 @@ impl<'src> Parser<'src> { elt: Box::new(element), generators, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2442,7 +2442,7 @@ impl<'src> Parser<'src> { value: Box::new(value), generators, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2462,7 +2462,7 @@ impl<'src> Parser<'src> { elt: Box::new(element), generators, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2499,7 +2499,7 @@ impl<'src> Parser<'src> { value: Box::new(parsed_expr.expr), ctx: ExprContext::Load, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2522,7 +2522,7 @@ impl<'src> Parser<'src> { ast::ExprAwait { value: Box::new(parsed_expr.expr), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2571,7 +2571,7 @@ impl<'src> Parser<'src> { Expr::Yield(ast::ExprYield { value, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } @@ -2611,7 +2611,7 @@ impl<'src> Parser<'src> { Expr::YieldFrom(ast::ExprYieldFrom { value: Box::new(expr), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } @@ -2652,7 +2652,7 @@ impl<'src> Parser<'src> { target: Box::new(target), value: Box::new(value.expr), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2700,7 +2700,7 @@ impl<'src> Parser<'src> { body: Box::new(body.expr), parameters, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2725,7 +2725,7 @@ impl<'src> Parser<'src> { test: Box::new(test.expr), orelse: Box::new(orelse.expr), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2751,7 +2751,7 @@ impl<'src> Parser<'src> { let command = ast::ExprIpyEscapeCommand { range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, kind, value, }; @@ -3010,7 +3010,7 @@ impl From for FString { elements: value.elements, range: value.range, flags: value.flags.into(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } } @@ -3021,7 +3021,7 @@ impl From for TString { elements: value.elements, range: value.range, flags: value.flags.into(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } } diff --git a/crates/ruff_python_parser/src/parser/mod.rs b/crates/ruff_python_parser/src/parser/mod.rs index ccd44b2592..5f35b84b04 100644 --- a/crates/ruff_python_parser/src/parser/mod.rs +++ b/crates/ruff_python_parser/src/parser/mod.rs @@ -133,7 +133,7 @@ impl<'src> Parser<'src> { ModExpression { body: Box::new(parsed_expr.expr), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -151,7 +151,7 @@ impl<'src> Parser<'src> { ModModule { body, range: TextRange::new(self.start_offset, self.current_token_range().end()), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } diff --git a/crates/ruff_python_parser/src/parser/pattern.rs b/crates/ruff_python_parser/src/parser/pattern.rs index dd552410db..2839a7dcad 100644 --- a/crates/ruff_python_parser/src/parser/pattern.rs +++ b/crates/ruff_python_parser/src/parser/pattern.rs @@ -112,7 +112,7 @@ impl Parser<'_> { lhs = Pattern::MatchOr(ast::PatternMatchOr { range: self.node_range(start), patterns, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } @@ -128,7 +128,7 @@ impl Parser<'_> { range: self.node_range(start), name: Some(ident), pattern: Some(Box::new(lhs)), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } @@ -255,7 +255,7 @@ impl Parser<'_> { keys, patterns, rest, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -279,7 +279,7 @@ impl Parser<'_> { } else { Some(ident) }, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -319,7 +319,7 @@ impl Parser<'_> { return Pattern::MatchSequence(ast::PatternMatchSequence { patterns: vec![], range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } @@ -374,7 +374,7 @@ impl Parser<'_> { ast::PatternMatchSequence { range: self.node_range(start), patterns, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -389,7 +389,7 @@ impl Parser<'_> { Pattern::MatchSingleton(ast::PatternMatchSingleton { value: Singleton::None, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::True => { @@ -397,7 +397,7 @@ impl Parser<'_> { Pattern::MatchSingleton(ast::PatternMatchSingleton { value: Singleton::True, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::False => { @@ -405,7 +405,7 @@ impl Parser<'_> { Pattern::MatchSingleton(ast::PatternMatchSingleton { value: Singleton::False, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::String | TokenKind::FStringStart | TokenKind::TStringStart => { @@ -414,7 +414,7 @@ impl Parser<'_> { Pattern::MatchValue(ast::PatternMatchValue { value: Box::new(str), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::Complex => { @@ -427,10 +427,10 @@ impl Parser<'_> { value: Box::new(Expr::NumberLiteral(ast::ExprNumberLiteral { value: Number::Complex { real, imag }, range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::Int => { @@ -443,10 +443,10 @@ impl Parser<'_> { value: Box::new(Expr::NumberLiteral(ast::ExprNumberLiteral { value: Number::Int(value), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::Float => { @@ -459,10 +459,10 @@ impl Parser<'_> { value: Box::new(Expr::NumberLiteral(ast::ExprNumberLiteral { value: Number::Float(value), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } kind => { @@ -489,7 +489,7 @@ impl Parser<'_> { return Pattern::MatchValue(ast::PatternMatchValue { value: Box::new(Expr::UnaryOp(unary_expr)), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } } @@ -509,7 +509,7 @@ impl Parser<'_> { Pattern::MatchValue(ast::PatternMatchValue { value: Box::new(attribute), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } else { // test_ok match_as_pattern_soft_keyword @@ -530,7 +530,7 @@ impl Parser<'_> { range: ident.range, pattern: None, name: if &ident == "_" { None } else { Some(ident) }, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } } else { @@ -544,12 +544,12 @@ impl Parser<'_> { range: self.missing_node_range(), id: Name::empty(), ctx: ExprContext::Invalid, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); Pattern::MatchValue(ast::PatternMatchValue { range: invalid_node.range(), value: Box::new(invalid_node), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } } @@ -605,10 +605,10 @@ impl Parser<'_> { op: operator, right: rhs_value, range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -648,14 +648,14 @@ impl Parser<'_> { range: ident.range(), id: ident.id, ctx: ExprContext::Load, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })) } else { Box::new(Expr::Name(ast::ExprName { range: ident.range(), id: Name::empty(), ctx: ExprContext::Invalid, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })) } } @@ -707,7 +707,7 @@ impl Parser<'_> { ast::Identifier { id: Name::empty(), range: parser.missing_node_range(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } }; @@ -717,7 +717,7 @@ impl Parser<'_> { attr: key, pattern: value_pattern, range: parser.node_range(pattern_start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); } else { has_seen_pattern = true; @@ -743,10 +743,10 @@ impl Parser<'_> { patterns, keywords, range: self.node_range(arguments_start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } } diff --git a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__expr_mode_valid_syntax.snap b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__expr_mode_valid_syntax.snap index ab002c583a..714127298b 100644 --- a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__expr_mode_valid_syntax.snap +++ b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__expr_mode_valid_syntax.snap @@ -4,7 +4,7 @@ expression: parsed.expr() --- Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, id: Name("first"), ctx: Load, diff --git a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap index 8d6fbc000c..f181d200c0 100644 --- a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap +++ b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap @@ -4,20 +4,20 @@ expression: parsed.syntax() --- Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..929, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..42, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..40, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("a"), ctx: Load, @@ -26,7 +26,7 @@ Module( op: Mod, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("b"), ctx: Load, @@ -38,7 +38,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..73, kind: Help2, value: "a.foo", @@ -46,7 +46,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..80, kind: Help, value: "a.foo", @@ -54,7 +54,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..88, kind: Help, value: "a.foo", @@ -62,7 +62,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..100, kind: Help2, value: "a.foo()", @@ -70,7 +70,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..128, kind: Magic, value: "timeit a = b", @@ -78,7 +78,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..147, kind: Magic, value: "timeit foo(b) % 3", @@ -86,7 +86,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..176, kind: Magic, value: "alias showPath pwd && ls -a", @@ -94,7 +94,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..205, kind: Magic, value: "timeit a = foo(b); b = 2", @@ -102,7 +102,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..226, kind: Magic, value: "matplotlib --inline", @@ -110,7 +110,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..253, kind: Magic, value: "matplotlib --inline", @@ -118,7 +118,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 277..309, kind: Shell, value: "pwd && ls -a | sed 's/^/\\ /'", @@ -126,7 +126,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..347, kind: Shell, value: "pwd && ls -a | sed 's/^/\\\\ /'", @@ -134,7 +134,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..393, kind: ShCap, value: "cd /Users/foo/Library/Application\\ Support/", @@ -142,21 +142,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 566..626, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 570..573, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 573..575, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -167,16 +165,16 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 581..626, value: Some( Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 598..620, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 598..599, id: Name("a"), ctx: Load, @@ -188,7 +186,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 619..620, id: Name("b"), ctx: Load, @@ -205,7 +203,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 656..664, kind: Paren, value: "foo 1 2", @@ -213,7 +211,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 665..673, kind: Quote2, value: "foo 1 2", @@ -221,7 +219,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 674..682, kind: Quote, value: "foo 1 2", @@ -229,12 +227,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 711..737, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 715..716, id: Name("a"), ctx: Store, @@ -242,11 +240,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 720..728, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 720..725, id: Name("range"), ctx: Load, @@ -254,11 +252,11 @@ Module( ), arguments: Arguments { range: 725..728, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 726..727, value: Int( 5, @@ -273,7 +271,7 @@ Module( body: [ IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 734..737, kind: Shell, value: "ls", @@ -285,12 +283,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 739..748, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 739..741, id: Name("p1"), ctx: Store, @@ -299,7 +297,7 @@ Module( ], value: IpyEscapeCommand( ExprIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 744..748, kind: Shell, value: "pwd", @@ -309,11 +307,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 749..763, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 749..751, id: Name("p2"), ctx: Store, @@ -321,7 +319,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 753..756, id: Name("str"), ctx: Load, @@ -330,7 +328,7 @@ Module( value: Some( IpyEscapeCommand( ExprIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 759..763, kind: Shell, value: "pwd", @@ -342,12 +340,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 764..784, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 764..767, id: Name("foo"), ctx: Store, @@ -356,7 +354,7 @@ Module( ], value: IpyEscapeCommand( ExprIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 770..784, kind: Magic, value: "foo bar", @@ -366,7 +364,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 786..791, kind: Magic, value: " foo", @@ -374,12 +372,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 792..813, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 792..795, id: Name("foo"), ctx: Store, @@ -388,7 +386,7 @@ Module( ], value: IpyEscapeCommand( ExprIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 798..813, kind: Magic, value: "foo # comment", @@ -398,7 +396,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 838..842, kind: Help, value: "foo", @@ -406,7 +404,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 843..852, kind: Help2, value: "foo.bar", @@ -414,7 +412,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 853..865, kind: Help, value: "foo.bar.baz", @@ -422,7 +420,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 866..874, kind: Help2, value: "foo[0]", @@ -430,7 +428,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 875..885, kind: Help, value: "foo[0][1]", @@ -438,7 +436,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 886..905, kind: Help2, value: "foo.bar[0].baz[1]", @@ -446,7 +444,7 @@ Module( ), IpyEscapeCommand( StmtIpyEscapeCommand { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 906..929, kind: Help2, value: "foo.bar[0].baz[2].egg", diff --git a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap index 6ee807fc8c..2e77ece943 100644 --- a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap +++ b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap @@ -5,12 +5,12 @@ expression: suite [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..37, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -19,13 +19,13 @@ expression: suite ], value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..37, value: StringLiteralValue { inner: Single( StringLiteral { range: 4..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\u{8}another cool trick", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/parser/statement.rs b/crates/ruff_python_parser/src/parser/statement.rs index d738fc78d6..171cffaa41 100644 --- a/crates/ruff_python_parser/src/parser/statement.rs +++ b/crates/ruff_python_parser/src/parser/statement.rs @@ -312,7 +312,7 @@ impl<'src> Parser<'src> { Stmt::Expr(ast::StmtExpr { range: self.node_range(start), value: Box::new(parsed_expr.expr), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } } @@ -368,7 +368,7 @@ impl<'src> Parser<'src> { ast::StmtDelete { targets, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -417,7 +417,7 @@ impl<'src> Parser<'src> { ast::StmtReturn { range: self.node_range(start), value, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -523,7 +523,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), exc, cause, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -564,7 +564,7 @@ impl<'src> Parser<'src> { ast::StmtImport { range: self.node_range(start), names, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -676,7 +676,7 @@ impl<'src> Parser<'src> { names, level: leading_dots, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -693,11 +693,11 @@ impl<'src> Parser<'src> { name: ast::Identifier { id: Name::new_static("*"), range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }, asname: None, range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }; } @@ -730,7 +730,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), name, asname, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -759,7 +759,7 @@ impl<'src> Parser<'src> { ast::Identifier { id: Name::from(dotted_name), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -775,7 +775,7 @@ impl<'src> Parser<'src> { self.bump(TokenKind::Pass); ast::StmtPass { range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -791,7 +791,7 @@ impl<'src> Parser<'src> { self.bump(TokenKind::Continue); ast::StmtContinue { range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -807,7 +807,7 @@ impl<'src> Parser<'src> { self.bump(TokenKind::Break); ast::StmtBreak { range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -857,7 +857,7 @@ impl<'src> Parser<'src> { test: Box::new(test.expr), msg, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -896,7 +896,7 @@ impl<'src> Parser<'src> { ast::StmtGlobal { range: self.node_range(start), names, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -942,7 +942,7 @@ impl<'src> Parser<'src> { ast::StmtNonlocal { range: self.node_range(start), names, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -995,7 +995,7 @@ impl<'src> Parser<'src> { type_params: type_params.map(Box::new), value: Box::new(value.expr), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1022,7 +1022,7 @@ impl<'src> Parser<'src> { range, kind, value, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1119,7 +1119,7 @@ impl<'src> Parser<'src> { value: value.into_boxed_str(), kind, range: self.node_range(parsed_expr.start()), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1187,7 +1187,7 @@ impl<'src> Parser<'src> { targets, value: Box::new(value.expr), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1267,7 +1267,7 @@ impl<'src> Parser<'src> { value, simple, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1322,7 +1322,7 @@ impl<'src> Parser<'src> { op, value: Box::new(value.expr), range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1378,7 +1378,7 @@ impl<'src> Parser<'src> { body, elif_else_clauses, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1422,7 +1422,7 @@ impl<'src> Parser<'src> { test, body, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1572,7 +1572,7 @@ impl<'src> Parser<'src> { finalbody, is_star, range: self.node_range(try_start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1722,7 +1722,7 @@ impl<'src> Parser<'src> { name, body: except_body, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }), block_kind, ) @@ -1834,7 +1834,7 @@ impl<'src> Parser<'src> { body, orelse, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -1882,7 +1882,7 @@ impl<'src> Parser<'src> { body, orelse, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2012,7 +2012,7 @@ impl<'src> Parser<'src> { is_async: false, returns, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2082,7 +2082,7 @@ impl<'src> Parser<'src> { type_params: type_params.map(Box::new), arguments, body, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2109,7 +2109,7 @@ impl<'src> Parser<'src> { body, is_async: false, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2378,7 +2378,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), context_expr: context_expr.expr, optional_vars, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }, } } @@ -2447,7 +2447,7 @@ impl<'src> Parser<'src> { subject: Box::new(subject), cases, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } TokenKind::Newline if matches!(self.peek2(), (TokenKind::Indent, TokenKind::Case)) => { @@ -2470,7 +2470,7 @@ impl<'src> Parser<'src> { subject: Box::new(subject), cases, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } _ => { @@ -2518,7 +2518,7 @@ impl<'src> Parser<'src> { subject: Box::new(subject), cases, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2697,7 +2697,7 @@ impl<'src> Parser<'src> { guard, body, range: self.node_range(start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -2866,7 +2866,7 @@ impl<'src> Parser<'src> { decorators.push(ast::Decorator { expression: parsed_expr.expr, range: self.node_range(decorator_start), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); // test_err decorator_missing_newline @@ -3080,7 +3080,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), name, annotation, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -3130,7 +3130,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), parameter, default, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -3448,7 +3448,7 @@ impl<'src> Parser<'src> { ast::TypeParams { range: self.node_range(start), type_params, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, } } @@ -3511,7 +3511,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), name, default, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) // test_ok type_param_param_spec @@ -3551,7 +3551,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), name, default, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) // test_ok type_param_type_var // type X[T] = int @@ -3635,7 +3635,7 @@ impl<'src> Parser<'src> { name, bound, default, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } } diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__backspace_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__backspace_alias.snap index 04e5596e74..9a734b8be4 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__backspace_alias.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__backspace_alias.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\u{8}", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__bell_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__bell_alias.snap index 8f28967afe..72fcda7d2a 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__bell_alias.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__bell_alias.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\u{7}", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__carriage_return_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__carriage_return_alias.snap index 258440c8d4..3f04c6f2d7 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__carriage_return_alias.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__carriage_return_alias.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..21, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..21, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\r", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__character_tabulation_with_justification_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__character_tabulation_with_justification_alias.snap index 447e6a7e41..791588d794 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__character_tabulation_with_justification_alias.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__character_tabulation_with_justification_alias.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..45, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..45, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\u{89}", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__delete_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__delete_alias.snap index ac810427d1..2d53ec0f3d 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__delete_alias.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__delete_alias.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\u{7f}", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap index ccac176830..546f94b9d9 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap @@ -5,12 +5,12 @@ expression: suite [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("bold"), ctx: Store, @@ -19,13 +19,13 @@ expression: suite ], value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..16, value: StringLiteralValue { inner: Single( StringLiteral { range: 7..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\u{3}8[1m", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__double_quoted_byte.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__double_quoted_byte.snap index 59f9b5213b..687ce16e1d 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__double_quoted_byte.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__double_quoted_byte.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..738, value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..738, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 0..738, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 0, 1, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_alias.snap index 4f706e1fde..2cec840d0a 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_alias.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_alias.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\u{1b}", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_char_in_byte_literal.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_char_in_byte_literal.snap index aad2af9894..e0ad6cff1b 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_char_in_byte_literal.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_char_in_byte_literal.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 0..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 111, 109, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_octet.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_octet.snap index cfc7e3ee09..80aad9289c 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_octet.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__escape_octet.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 0..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 35, 97, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__form_feed_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__form_feed_alias.snap index 21c8747c01..2067566074 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__form_feed_alias.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__form_feed_alias.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\u{c}", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap index b418df379e..ed6a838d4e 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap @@ -5,33 +5,33 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, value: FStringValue { inner: Single( FString( FString { range: 0..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 2..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "aaa", }, ), Interpolation( InterpolatedElement { range: 5..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..9, id: Name("bbb"), ctx: Load, @@ -45,17 +45,17 @@ expression: suite Literal( InterpolatedStringLiteralElement { range: 10..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "ccc", }, ), Interpolation( InterpolatedElement { range: 13..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("ddd"), ctx: Load, @@ -69,7 +69,7 @@ expression: suite Literal( InterpolatedStringLiteralElement { range: 18..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "eee", }, ), diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap index 8cb891a551..990c1d9dad 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap @@ -5,33 +5,33 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: FStringValue { inner: Single( FString( FString { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 2..4, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\", }, ), Interpolation( InterpolatedElement { range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap index b1df67c78f..7fbfd50e8e 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap @@ -5,33 +5,33 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: FStringValue { inner: Single( FString( FString { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 2..4, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\n", }, ), Interpolation( InterpolatedElement { range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap index c3fd51c096..d950371db1 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap @@ -5,33 +5,33 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: FStringValue { inner: Single( FString( FString { range: 0..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 3..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\\n", }, ), Interpolation( InterpolatedElement { range: 5..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap index 35e090916c..2955122167 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: FStringValue { inner: Single( FString( FString { range: 0..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, id: Name("user"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap index e05de72bc4..dc882a8c57 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap @@ -5,33 +5,33 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, value: FStringValue { inner: Single( FString( FString { range: 0..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 2..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "mix ", }, ), Interpolation( InterpolatedElement { range: 6..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..11, id: Name("user"), ctx: Load, @@ -50,17 +50,17 @@ expression: suite Literal( InterpolatedStringLiteralElement { range: 13..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " with text and ", }, ), Interpolation( InterpolatedElement { range: 28..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..35, id: Name("second"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap index 932339c359..da86391550 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, value: FStringValue { inner: Single( FString( FString { range: 0..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, id: Name("user"), ctx: Load, @@ -40,12 +40,12 @@ expression: suite format_spec: Some( InterpolatedStringFormatSpec { range: 9..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 9..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ">10", }, ), diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap index f651b99dff..42fcd75676 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap @@ -5,33 +5,33 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: FStringValue { inner: Single( FString( FString { range: 0..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\n", }, ), Interpolation( InterpolatedElement { range: 5..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__hts_alias.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__hts_alias.snap index 4d694d9dca..cdf45c0397 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__hts_alias.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__hts_alias.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\u{88}", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap index 52bb0728d3..f865593fb2 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap @@ -5,18 +5,18 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, value: FStringValue { inner: Single( FString( FString { range: 0..3, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: FStringFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap index 8a95e3a166..98b1fa3461 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, value: TStringValue { inner: Single( TString { range: 0..3, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: TStringFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap index 291eb7e8f4..d539cb8deb 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap @@ -5,11 +5,11 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: FStringValue { inner: Concatenated( @@ -17,7 +17,7 @@ expression: suite Literal( StringLiteral { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello ", flags: StringLiteralFlags { quote_style: Single, @@ -29,12 +29,12 @@ expression: suite FString( FString { range: 9..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 11..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world", }, ), diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap index 291eb7e8f4..d539cb8deb 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap @@ -5,11 +5,11 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: FStringValue { inner: Concatenated( @@ -17,7 +17,7 @@ expression: suite Literal( StringLiteral { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello ", flags: StringLiteralFlags { quote_style: Single, @@ -29,12 +29,12 @@ expression: suite FString( FString { range: 9..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 11..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world", }, ), diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap index 66e0a2cbd9..1193adb2e4 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap @@ -5,11 +5,11 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, value: FStringValue { inner: Concatenated( @@ -17,7 +17,7 @@ expression: suite Literal( StringLiteral { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello ", flags: StringLiteralFlags { quote_style: Single, @@ -29,28 +29,28 @@ expression: suite FString( FString { range: 9..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 11..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world", }, ), Interpolation( InterpolatedElement { range: 16..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, value: StringLiteralValue { inner: Single( StringLiteral { range: 17..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "!", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap index d7830a63d0..02419e8a00 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap @@ -5,11 +5,11 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..31, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..31, value: FStringValue { inner: Concatenated( @@ -17,7 +17,7 @@ expression: suite Literal( StringLiteral { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello ", flags: StringLiteralFlags { quote_style: Single, @@ -29,28 +29,28 @@ expression: suite FString( FString { range: 9..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 11..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world", }, ), Interpolation( InterpolatedElement { range: 16..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, value: StringLiteralValue { inner: Single( StringLiteral { range: 17..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "!", flags: StringLiteralFlags { quote_style: Double, @@ -78,7 +78,7 @@ expression: suite Literal( StringLiteral { range: 23..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "again!", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap index d4d4e01a4a..db72a345e0 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: FStringValue { inner: Single( FString( FString { range: 0..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("a"), ctx: Load, @@ -38,10 +38,10 @@ expression: suite Interpolation( InterpolatedElement { range: 5..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("b"), ctx: Load, @@ -55,7 +55,7 @@ expression: suite Literal( InterpolatedStringLiteralElement { range: 10..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "{foo}", }, ), diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap index 93333df2aa..07654a0e22 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap @@ -5,30 +5,30 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: FStringValue { inner: Single( FString( FString { range: 0..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..11, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..5, value: Int( 42, @@ -41,7 +41,7 @@ expression: suite comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..11, value: Int( 42, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap index 2e0f5c6474..1d80035515 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, value: FStringValue { inner: Single( FString( FString { range: 0..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("foo"), ctx: Load, @@ -35,15 +35,15 @@ expression: suite format_spec: Some( InterpolatedStringFormatSpec { range: 7..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 7..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..13, value: StringLiteralValue { inner: Concatenated( @@ -51,7 +51,7 @@ expression: suite strings: [ StringLiteral { range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, @@ -61,7 +61,7 @@ expression: suite }, StringLiteral { range: 11..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap index 479ea844b6..3ed5dbd04b 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: FStringValue { inner: Single( FString( FString { range: 0..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("foo"), ctx: Load, @@ -35,15 +35,15 @@ expression: suite format_spec: Some( InterpolatedStringFormatSpec { range: 7..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 7..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..12, id: Name("spec"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap index c9ef305e70..68960eab25 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: FStringValue { inner: Single( FString( FString { range: 0..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("foo"), ctx: Load, @@ -35,21 +35,21 @@ expression: suite format_spec: Some( InterpolatedStringFormatSpec { range: 7..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 7..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..10, value: StringLiteralValue { inner: Single( StringLiteral { range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap index 42ef942c16..f3fa222a17 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap @@ -5,30 +5,30 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: FStringValue { inner: Single( FString( FString { range: 0..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..9, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, value: Int( 1, @@ -41,7 +41,7 @@ expression: suite comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, value: Int( 2, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap index 3b428b4148..2f9be02104 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: FStringValue { inner: Single( FString( FString { range: 0..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("foo"), ctx: Load, @@ -35,12 +35,12 @@ expression: suite format_spec: Some( InterpolatedStringFormatSpec { range: 7..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 7..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "spec", }, ), diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap index 764c3768a4..e53098fdec 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: FStringValue { inner: Single( FString( FString { range: 0..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap index 869d7ff2d3..7de32a7c0c 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: FStringValue { inner: Single( FString( FString { range: 0..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap index 1989651e7f..3154dbeff5 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: FStringValue { inner: Single( FString( FString { range: 0..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..8, value: None, }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_concat.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_concat.snap index c5e7745a97..20b0be9eab 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_concat.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_concat.snap @@ -5,11 +5,11 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, value: StringLiteralValue { inner: Concatenated( @@ -17,7 +17,7 @@ expression: suite strings: [ StringLiteral { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello ", flags: StringLiteralFlags { quote_style: Single, @@ -27,7 +27,7 @@ expression: suite }, StringLiteral { range: 9..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_triple_quotes_with_kind.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_triple_quotes_with_kind.snap index 295d3fd634..e37ba3eaf0 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_triple_quotes_with_kind.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_string_triple_quotes_with_kind.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello, world!", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap index f7e45b3308..64cb321009 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: TStringValue { inner: Single( TString { range: 0..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("a"), ctx: Load, @@ -37,10 +37,10 @@ expression: suite Interpolation( InterpolatedElement { range: 5..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("b"), ctx: Load, @@ -54,7 +54,7 @@ expression: suite Literal( InterpolatedStringLiteralElement { range: 10..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "{foo}", }, ), diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap index 655c257691..af2754bea4 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap @@ -5,29 +5,29 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: TStringValue { inner: Single( TString { range: 0..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..11, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..5, value: Int( 42, @@ -40,7 +40,7 @@ expression: suite comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..11, value: Int( 42, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap index 8b719bdbef..bfef44ca1a 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, value: TStringValue { inner: Single( TString { range: 0..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("foo"), ctx: Load, @@ -34,15 +34,15 @@ expression: suite format_spec: Some( InterpolatedStringFormatSpec { range: 7..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 7..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..13, value: StringLiteralValue { inner: Concatenated( @@ -50,7 +50,7 @@ expression: suite strings: [ StringLiteral { range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, @@ -60,7 +60,7 @@ expression: suite }, StringLiteral { range: 11..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap index 11102f6346..2432a03fea 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: TStringValue { inner: Single( TString { range: 0..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("foo"), ctx: Load, @@ -34,15 +34,15 @@ expression: suite format_spec: Some( InterpolatedStringFormatSpec { range: 7..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 7..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..12, id: Name("spec"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap index 789ef89073..4d167f6391 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: TStringValue { inner: Single( TString { range: 0..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("foo"), ctx: Load, @@ -34,21 +34,21 @@ expression: suite format_spec: Some( InterpolatedStringFormatSpec { range: 7..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 7..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..10, value: StringLiteralValue { inner: Single( StringLiteral { range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap index 151ac16383..cda9ac6385 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap @@ -5,29 +5,29 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: TStringValue { inner: Single( TString { range: 0..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..9, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, value: Int( 1, @@ -40,7 +40,7 @@ expression: suite comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, value: Int( 2, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap index 38fb62b089..607db4621e 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: TStringValue { inner: Single( TString { range: 0..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("foo"), ctx: Load, @@ -34,12 +34,12 @@ expression: suite format_spec: Some( InterpolatedStringFormatSpec { range: 7..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 7..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "spec", }, ), diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap index b1972bb8c2..82a3532343 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: TStringValue { inner: Single( TString { range: 0..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap index 0abdf4feea..5b44cbb07e 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: TStringValue { inner: Single( TString { range: 0..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap index 2efd41e5a3..745e1afdf4 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: TStringValue { inner: Single( TString { range: 0..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..8, value: None, }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap index 0b9244c730..bfadf93148 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap @@ -5,11 +5,11 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: FStringValue { inner: Concatenated( @@ -17,7 +17,7 @@ expression: suite Literal( StringLiteral { range: 0..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello ", flags: StringLiteralFlags { quote_style: Single, @@ -29,12 +29,12 @@ expression: suite FString( FString { range: 10..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 12..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world", }, ), diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap index 76de944bab..31dcb6c17d 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap @@ -5,11 +5,11 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, value: FStringValue { inner: Concatenated( @@ -17,7 +17,7 @@ expression: suite Literal( StringLiteral { range: 0..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello ", flags: StringLiteralFlags { quote_style: Single, @@ -29,12 +29,12 @@ expression: suite FString( FString { range: 10..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 12..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world", }, ), @@ -49,7 +49,7 @@ expression: suite Literal( StringLiteral { range: 19..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "!", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_1.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_1.snap index b6c48ef5d8..8a8b31c488 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_1.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_1.snap @@ -5,11 +5,11 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: StringLiteralValue { inner: Concatenated( @@ -17,7 +17,7 @@ expression: suite strings: [ StringLiteral { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello ", flags: StringLiteralFlags { quote_style: Single, @@ -27,7 +27,7 @@ expression: suite }, StringLiteral { range: 9..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_2.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_2.snap index 7ad459df3f..6dd96bc445 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_2.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_string_concat_2.snap @@ -5,11 +5,11 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: StringLiteralValue { inner: Concatenated( @@ -17,7 +17,7 @@ expression: suite strings: [ StringLiteral { range: 0..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello ", flags: StringLiteralFlags { quote_style: Single, @@ -27,7 +27,7 @@ expression: suite }, StringLiteral { range: 10..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_1.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_1.snap index 8c3cd6bc04..d90d77f669 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_1.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_1.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 92, 120, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_2.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_2.snap index f3a05cb297..9dc2e32ae2 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_2.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_byte_literal_2.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 0..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 92, 92, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap index 7156cd9073..2454031212 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: FStringValue { inner: Single( FString( FString { range: 0..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 3..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap index 5200cdade1..41f1bac3ab 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: TStringValue { inner: Single( TString { range: 0..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 3..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__single_quoted_byte.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__single_quoted_byte.snap index b85749f0dc..b156356ac7 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__single_quoted_byte.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__single_quoted_byte.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..738, value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..738, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 0..738, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 0, 1, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_mac_eol.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_mac_eol.snap index 432c43fcf4..c2521fd8ac 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_mac_eol.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_mac_eol.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "text more text", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_unix_eol.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_unix_eol.snap index 432c43fcf4..c2521fd8ac 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_unix_eol.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_unix_eol.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "text more text", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_windows_eol.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_windows_eol.snap index dfaefc86f8..b66b5c3738 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_windows_eol.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__string_parser_escaped_windows_eol.snap @@ -5,17 +5,17 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "text more text", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap index a65a7d4b39..3ec5fbae97 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap @@ -5,26 +5,26 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: FStringValue { inner: Single( FString( FString { range: 0..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 5..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap index 71a7e8c067..bdf91f88e5 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: TStringValue { inner: Single( TString { range: 0..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 5..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap index d87b9c51f3..7460cec091 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap @@ -5,32 +5,32 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, value: TStringValue { inner: Single( TString { range: 0..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 2..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "aaa", }, ), Interpolation( InterpolatedElement { range: 5..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..9, id: Name("bbb"), ctx: Load, @@ -44,17 +44,17 @@ expression: suite Literal( InterpolatedStringLiteralElement { range: 10..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "ccc", }, ), Interpolation( InterpolatedElement { range: 13..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("ddd"), ctx: Load, @@ -68,7 +68,7 @@ expression: suite Literal( InterpolatedStringLiteralElement { range: 18..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "eee", }, ), diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap index 416ad8570a..44d783177f 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap @@ -5,32 +5,32 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: TStringValue { inner: Single( TString { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 2..4, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\", }, ), Interpolation( InterpolatedElement { range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap index 85e4ce745b..d17834c3b1 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap @@ -5,32 +5,32 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: TStringValue { inner: Single( TString { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 2..4, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\n", }, ), Interpolation( InterpolatedElement { range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap index 04ca645b9e..7a142da726 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap @@ -5,32 +5,32 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: TStringValue { inner: Single( TString { range: 0..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 3..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\\n", }, ), Interpolation( InterpolatedElement { range: 5..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap index 147b6c7b10..81b079ca5e 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: TStringValue { inner: Single( TString { range: 0..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, id: Name("user"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap index 8f098418fc..4af3383006 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap @@ -5,32 +5,32 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, value: TStringValue { inner: Single( TString { range: 0..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 2..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "mix ", }, ), Interpolation( InterpolatedElement { range: 6..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..11, id: Name("user"), ctx: Load, @@ -49,17 +49,17 @@ expression: suite Literal( InterpolatedStringLiteralElement { range: 13..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " with text and ", }, ), Interpolation( InterpolatedElement { range: 28..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..35, id: Name("second"), ctx: Load, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap index c11b0164f6..d8970fbf3a 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap @@ -5,25 +5,25 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, value: TStringValue { inner: Single( TString { range: 0..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, id: Name("user"), ctx: Load, @@ -39,12 +39,12 @@ expression: suite format_spec: Some( InterpolatedStringFormatSpec { range: 9..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 9..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ">10", }, ), diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap index 728682c92c..19db8fe2e7 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap @@ -5,32 +5,32 @@ expression: suite [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: TStringValue { inner: Single( TString { range: 0..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\n", }, ), Interpolation( InterpolatedElement { range: 5..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/src/string.rs b/crates/ruff_python_parser/src/string.rs index 8a0342ded2..4510934685 100644 --- a/crates/ruff_python_parser/src/string.rs +++ b/crates/ruff_python_parser/src/string.rs @@ -287,7 +287,7 @@ impl StringParser { return Ok(ast::InterpolatedStringLiteralElement { value: self.source, range: self.range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }); }; @@ -365,7 +365,7 @@ impl StringParser { Ok(ast::InterpolatedStringLiteralElement { value: value.into_boxed_str(), range: self.range, - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, }) } @@ -387,7 +387,7 @@ impl StringParser { value: self.source.into_boxed_bytes(), range: self.range, flags: self.flags.into(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })); } @@ -397,7 +397,7 @@ impl StringParser { value: self.source.into_boxed_bytes(), range: self.range, flags: self.flags.into(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })); }; @@ -435,7 +435,7 @@ impl StringParser { value: value.into_boxed_slice(), range: self.range, flags: self.flags.into(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })) } @@ -446,7 +446,7 @@ impl StringParser { value: self.source, range: self.range, flags: self.flags.into(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })); } @@ -456,7 +456,7 @@ impl StringParser { value: self.source, range: self.range, flags: self.flags.into(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })); }; @@ -494,7 +494,7 @@ impl StringParser { value: value.into_boxed_str(), range: self.range, flags: self.flags.into(), - node_index: AtomicNodeIndex::dummy(), + node_index: AtomicNodeIndex::NONE, })) } diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap index 172e4daa89..21eb2b1619 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/ann_assign_stmt_inval ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..63, body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -24,11 +24,11 @@ Module( ), annotation: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..7, id: Name("int"), ctx: Load, @@ -40,7 +40,7 @@ Module( value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, value: Int( 1, @@ -53,11 +53,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..26, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..13, id: Name("x"), ctx: Store, @@ -65,12 +65,12 @@ Module( ), annotation: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..22, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, id: Name("a"), ctx: Load, @@ -82,7 +82,7 @@ Module( value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, value: Int( 1, @@ -95,11 +95,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..46, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("x"), ctx: Store, @@ -107,11 +107,11 @@ Module( ), annotation: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..42, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("b"), ctx: Load, @@ -122,7 +122,7 @@ Module( value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..46, value: Int( 1, @@ -135,11 +135,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..51, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Store, @@ -147,7 +147,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..51, id: Name("y"), ctx: Load, @@ -159,12 +159,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..62, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..58, id: Name("int"), ctx: Store, @@ -173,7 +173,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..62, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap index 4a80fdc2f5..74e36dcbca 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/inline/err/ann_assign_stmt_inval ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..170, body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, target: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "abc", flags: StringLiteralFlags { quote_style: Double, @@ -36,7 +36,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..10, id: Name("str"), ctx: Load, @@ -45,13 +45,13 @@ Module( value: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..18, value: StringLiteralValue { inner: Single( StringLiteral { range: 13..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "def", flags: StringLiteralFlags { quote_style: Double, @@ -69,15 +69,15 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..37, target: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..25, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..23, id: Name("call"), ctx: Load, @@ -85,7 +85,7 @@ Module( ), arguments: Arguments { range: 23..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -93,7 +93,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..30, id: Name("str"), ctx: Load, @@ -102,13 +102,13 @@ Module( value: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..37, value: StringLiteralValue { inner: Single( StringLiteral { range: 33..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "no", flags: StringLiteralFlags { quote_style: Double, @@ -126,15 +126,15 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..52, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..40, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("x"), ctx: Store, @@ -145,7 +145,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..45, id: Name("int"), ctx: Load, @@ -154,12 +154,12 @@ Module( value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..52, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..49, value: Int( 1, @@ -168,7 +168,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 2, @@ -186,16 +186,16 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..83, target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..74, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("x"), ctx: Store, @@ -208,7 +208,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..79, id: Name("int"), ctx: Load, @@ -217,7 +217,7 @@ Module( value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, value: Int( 1, @@ -230,16 +230,16 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..100, target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..88, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..85, id: Name("x"), ctx: Store, @@ -247,7 +247,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..88, id: Name("y"), ctx: Store, @@ -260,7 +260,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..93, id: Name("int"), ctx: Load, @@ -269,12 +269,12 @@ Module( value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..100, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, value: Int( 1, @@ -283,7 +283,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, value: Int( 2, @@ -301,16 +301,16 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..119, target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..107, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, id: Name("x"), ctx: Store, @@ -318,7 +318,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, id: Name("y"), ctx: Store, @@ -331,7 +331,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, id: Name("int"), ctx: Load, @@ -340,12 +340,12 @@ Module( value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..119, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..116, value: Int( 1, @@ -354,7 +354,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..119, value: Int( 2, @@ -372,16 +372,16 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 138..150, target: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 138..141, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..140, id: Name("x"), ctx: Store, @@ -393,7 +393,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..146, id: Name("int"), ctx: Load, @@ -402,7 +402,7 @@ Module( value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..150, value: Int( 1, @@ -415,16 +415,16 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..169, target: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..157, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..153, id: Name("x"), ctx: Store, @@ -432,7 +432,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..156, id: Name("y"), ctx: Store, @@ -444,7 +444,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..162, id: Name("int"), ctx: Load, @@ -453,12 +453,12 @@ Module( value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..169, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..166, value: Int( 1, @@ -467,7 +467,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..169, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap index 1d69453670..f9ad11979a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/ann_assign_stmt_inval ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..65, body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -24,7 +24,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("Any"), ctx: Load, @@ -33,17 +33,17 @@ Module( value: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..17, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..17, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("a"), ctx: Load, @@ -51,7 +51,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("b"), ctx: Load, @@ -69,11 +69,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..28, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("x"), ctx: Store, @@ -81,7 +81,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, id: Name("Any"), ctx: Load, @@ -90,7 +90,7 @@ Module( value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("x"), ctx: Load, @@ -102,11 +102,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, value: Int( 1, @@ -117,11 +117,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..64, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("x"), ctx: Store, @@ -129,7 +129,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..41, id: Name("list"), ctx: Load, @@ -138,12 +138,12 @@ Module( value: Some( List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..64, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..46, id: Name("x"), ctx: Load, @@ -151,15 +151,15 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..54, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..54, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, id: Name("a"), ctx: Load, @@ -168,7 +168,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, id: Name("b"), ctx: Load, @@ -181,17 +181,17 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..63, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..63, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, id: Name("a"), ctx: Load, @@ -199,7 +199,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("b"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap index b1a6700394..babd340987 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/ann_assign_stmt_missi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -24,7 +24,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap index 957104e6d2..8c2e51d0cd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/ann_assign_stmt_type_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..37, body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("a"), ctx: Store, @@ -24,7 +24,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, id: Name("type"), ctx: Load, @@ -36,12 +36,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..15, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("X"), ctx: Store, @@ -50,7 +50,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, id: Name("int"), ctx: Load, @@ -60,16 +60,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..28, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..28, parameters: None, body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..28, id: Name("type"), ctx: Load, @@ -81,12 +81,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..36, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("X"), ctx: Store, @@ -95,7 +95,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..36, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap index 745c8c8c40..13b2bd4292 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/args_unparenthesized_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..92, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, id: Name("sum"), ctx: Load, @@ -28,15 +28,15 @@ Module( ), arguments: Arguments { range: 3..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..24, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Load, @@ -45,10 +45,10 @@ Module( generators: [ Comprehension { range: 6..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("x"), ctx: Store, @@ -56,11 +56,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..24, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..20, id: Name("range"), ctx: Load, @@ -68,11 +68,11 @@ Module( ), arguments: Arguments { range: 20..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..23, value: Int( 10, @@ -93,7 +93,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, value: Int( 5, @@ -109,15 +109,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..64, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..64, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..34, id: Name("total"), ctx: Load, @@ -125,11 +125,11 @@ Module( ), arguments: Arguments { range: 34..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, value: Int( 1, @@ -138,7 +138,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, value: Int( 2, @@ -147,11 +147,11 @@ Module( ), Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..60, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("x"), ctx: Load, @@ -160,10 +160,10 @@ Module( generators: [ Comprehension { range: 43..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Store, @@ -171,11 +171,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..60, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..57, id: Name("range"), ctx: Load, @@ -183,11 +183,11 @@ Module( ), arguments: Arguments { range: 57..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..59, value: Int( 5, @@ -208,7 +208,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, value: Int( 6, @@ -224,15 +224,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..91, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..91, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..68, id: Name("sum"), ctx: Load, @@ -240,15 +240,15 @@ Module( ), arguments: Arguments { range: 68..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..89, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..70, id: Name("x"), ctx: Load, @@ -257,10 +257,10 @@ Module( generators: [ Comprehension { range: 71..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, id: Name("x"), ctx: Store, @@ -268,11 +268,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..89, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..85, id: Name("range"), ctx: Load, @@ -280,11 +280,11 @@ Module( ), arguments: Arguments { range: 85..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..88, value: Int( 10, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap index e4f9844f73..fd78d8760b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/assert_empty_msg.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap index 8722a03c2e..2c64815756 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/assert_empty_test.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, body: [ Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..6, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap index bfef697184..2cc454ed48 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/assert_invalid_msg_ex ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..83, body: [ Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..12, value: false, }, @@ -24,11 +24,11 @@ Module( msg: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..16, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, id: Name("x"), ctx: Load, @@ -42,11 +42,11 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..30, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..29, value: false, }, @@ -56,11 +56,11 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..39, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("x"), ctx: Load, @@ -71,11 +71,11 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..61, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..52, value: false, }, @@ -83,12 +83,12 @@ Module( msg: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..61, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("x"), ctx: Load, @@ -102,11 +102,11 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..77, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..74, value: false, }, @@ -114,7 +114,7 @@ Module( msg: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..77, id: Name("x"), ctx: Load, @@ -125,11 +125,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap index 1f87e7e7b6..1a843b29c9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/assert_invalid_test_e ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..55, body: [ Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, test: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..9, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("x"), ctx: Load, @@ -34,11 +34,11 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..23, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..23, id: Name("assert"), ctx: Load, @@ -49,11 +49,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("x"), ctx: Load, @@ -63,16 +63,16 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..40, test: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..40, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("x"), ctx: Load, @@ -86,11 +86,11 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..49, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..49, id: Name("x"), ctx: Load, @@ -101,11 +101,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap index e317e4b49c..1085de726c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/assign_stmt_invalid_t ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..58, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, targets: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, value: Int( 1, @@ -27,7 +27,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, value: Int( 1, @@ -38,12 +38,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..15, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Store, @@ -51,7 +51,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, value: Int( 1, @@ -61,7 +61,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, value: Int( 2, @@ -72,12 +72,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..33, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("x"), ctx: Store, @@ -85,7 +85,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, value: Int( 1, @@ -94,7 +94,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("y"), ctx: Store, @@ -102,7 +102,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, value: Int( 2, @@ -112,7 +112,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, id: Name("z"), ctx: Load, @@ -122,23 +122,23 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..57, targets: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..44, elts: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..38, value: StringLiteralValue { inner: Single( StringLiteral { range: 35..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", flags: StringLiteralFlags { quote_style: Double, @@ -152,13 +152,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..43, value: StringLiteralValue { inner: Single( StringLiteral { range: 40..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "b", flags: StringLiteralFlags { quote_style: Double, @@ -177,18 +177,18 @@ Module( ], value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..57, elts: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..51, value: StringLiteralValue { inner: Single( StringLiteral { range: 48..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", flags: StringLiteralFlags { quote_style: Double, @@ -202,13 +202,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, value: StringLiteralValue { inner: Single( StringLiteral { range: 53..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "b", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap index 65ac6baf43..6fe406354b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/assign_stmt_invalid_v ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..90, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -26,22 +26,22 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..15, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..13, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("a"), ctx: Load, @@ -49,7 +49,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..13, id: Name("b"), ctx: Load, @@ -70,12 +70,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..34, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("x"), ctx: Store, @@ -84,12 +84,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..34, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..23, value: Int( 42, @@ -98,16 +98,16 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..33, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..33, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, id: Name("x"), ctx: Load, @@ -128,12 +128,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..58, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("x"), ctx: Store, @@ -142,12 +142,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..58, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..42, value: Int( 42, @@ -156,15 +156,15 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..57, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..57, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("x"), ctx: Load, @@ -184,12 +184,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..78, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, id: Name("x"), ctx: Store, @@ -198,35 +198,33 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..78, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..76, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..76, parameters: Some( Parameters { range: 72..73, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 72..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 72..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 72..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -240,7 +238,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, id: Name("x"), ctx: Load, @@ -260,12 +258,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..84, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, id: Name("x"), ctx: Store, @@ -274,7 +272,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, id: Name("x"), ctx: Load, @@ -284,11 +282,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap index 0f58eff527..6264d907b5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/assign_stmt_keyword_t ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..42, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("a"), ctx: Store, @@ -25,7 +25,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..8, id: Name("pass"), ctx: Store, @@ -34,7 +34,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, id: Name("c"), ctx: Load, @@ -44,15 +44,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..18, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..18, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("a"), ctx: Load, @@ -61,7 +61,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("b"), ctx: Load, @@ -73,12 +73,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..35, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("a"), ctx: Store, @@ -86,7 +86,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("b"), ctx: Store, @@ -94,7 +94,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..31, id: Name("pass"), ctx: Store, @@ -103,7 +103,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("c"), ctx: Load, @@ -113,15 +113,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..41, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..41, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, id: Name("a"), ctx: Load, @@ -130,7 +130,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("b"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap index 6ef39d8045..8a1f050533 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/assign_stmt_missing_r ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -26,7 +26,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..3, id: Name(""), ctx: Invalid, @@ -36,15 +36,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..9, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..9, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, value: Int( 1, @@ -54,7 +54,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, value: Int( 1, @@ -67,12 +67,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..17, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("x"), ctx: Store, @@ -80,7 +80,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("y"), ctx: Store, @@ -89,7 +89,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..17, id: Name(""), ctx: Invalid, @@ -99,15 +99,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..23, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..23, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, value: Int( 2, @@ -117,7 +117,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, value: Int( 2, @@ -130,12 +130,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..31, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("x"), ctx: Store, @@ -143,7 +143,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..27, id: Name(""), ctx: Store, @@ -152,7 +152,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..31, id: Name("y"), ctx: Load, @@ -162,15 +162,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..37, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..37, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, value: Int( 3, @@ -180,7 +180,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, value: Int( 3, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap index 5af1853e86..45bda59ff0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/assign_stmt_starred_e ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..45, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("_"), ctx: Store, @@ -26,16 +26,16 @@ Module( ], value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..9, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..9, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..8, value: Int( 42, @@ -53,12 +53,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..19, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("_"), ctx: Store, @@ -67,16 +67,16 @@ Module( ], value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..19, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..19, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..18, value: Int( 42, @@ -93,12 +93,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..31, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, id: Name("_"), ctx: Store, @@ -107,15 +107,15 @@ Module( ], value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..31, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..31, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..29, id: Name("list"), ctx: Load, @@ -123,7 +123,7 @@ Module( ), arguments: Arguments { range: 29..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -136,12 +136,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..44, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, id: Name("_"), ctx: Store, @@ -150,15 +150,15 @@ Module( ], value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..44, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..43, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("p"), ctx: Load, @@ -167,7 +167,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, id: Name("q"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap index 7ebaaad4b7..7d5b8fd56a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap @@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/err/async_unexpected_toke ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..116, body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..20, decorator_list: [], name: Identifier { id: Name("Foo"), range: 12..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, }, ), @@ -40,11 +40,11 @@ Module( ), While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..42, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..37, id: Name("test"), ctx: Load, @@ -53,11 +53,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, }, ), @@ -69,12 +69,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..54, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, id: Name("x"), ctx: Store, @@ -83,7 +83,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, value: Int( 1, @@ -94,21 +94,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..81, is_async: true, decorator_list: [], name: Identifier { id: Name("foo"), range: 71..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 74..76, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -119,11 +117,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..81, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..81, }, ), @@ -134,11 +132,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..115, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..98, id: Name("test"), ctx: Load, @@ -147,11 +145,11 @@ Module( cases: [ MatchCase { range: 104..115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 109..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -160,11 +158,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..115, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..115, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap index 78da56cda6..731d9a3996 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/aug_assign_stmt_inval ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..59, body: [ AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, target: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, value: Int( 1, @@ -26,7 +26,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, value: Int( 1, @@ -37,17 +37,17 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..17, target: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..10, value: StringLiteralValue { inner: Single( StringLiteral { range: 7..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", flags: StringLiteralFlags { quote_style: Double, @@ -62,13 +62,13 @@ Module( op: Add, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, value: StringLiteralValue { inner: Single( StringLiteral { range: 14..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "b", flags: StringLiteralFlags { quote_style: Double, @@ -84,15 +84,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..25, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..20, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("x"), ctx: Store, @@ -104,7 +104,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, value: Int( 1, @@ -115,17 +115,17 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..30, }, ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, value: Int( 1, @@ -136,11 +136,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..45, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, id: Name("x"), ctx: Store, @@ -149,7 +149,7 @@ Module( op: Add, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..45, id: Name("pass"), ctx: Load, @@ -159,15 +159,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..58, target: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..52, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Load, @@ -176,7 +176,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, id: Name("y"), ctx: Load, @@ -187,7 +187,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap index cfc583f1b8..eeec973fc9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/aug_assign_stmt_inval ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..77, body: [ AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -25,17 +25,17 @@ Module( op: Add, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..13, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("a"), ctx: Load, @@ -43,7 +43,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..13, id: Name("b"), ctx: Load, @@ -59,11 +59,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..27, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("x"), ctx: Store, @@ -72,16 +72,16 @@ Module( op: Add, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..27, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..27, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("x"), ctx: Load, @@ -97,11 +97,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..46, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, id: Name("x"), ctx: Store, @@ -110,15 +110,15 @@ Module( op: Add, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..46, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..46, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..46, id: Name("x"), ctx: Load, @@ -133,11 +133,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..64, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Store, @@ -146,30 +146,28 @@ Module( op: Add, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..64, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..64, parameters: Some( Parameters { range: 60..61, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -183,7 +181,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, id: Name("x"), ctx: Load, @@ -198,11 +196,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..71, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, id: Name("x"), ctx: Store, @@ -211,7 +209,7 @@ Module( op: Add, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, id: Name("y"), ctx: Load, @@ -221,11 +219,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap index 50e27a1c5e..f367265ec7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/aug_assign_stmt_missi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..27, body: [ AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -25,7 +25,7 @@ Module( op: Add, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..4, id: Name(""), ctx: Invalid, @@ -35,15 +35,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, value: Int( 1, @@ -53,7 +53,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 1, @@ -66,11 +66,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..17, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, id: Name("x"), ctx: Store, @@ -79,7 +79,7 @@ Module( op: Add, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("y"), ctx: Load, @@ -89,15 +89,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..26, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..26, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, value: Int( 2, @@ -107,7 +107,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap index 0e0305e26b..99c12452b7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/case_expect_indented_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..43, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..42, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, id: Name("subject"), ctx: Load, @@ -25,14 +25,14 @@ Module( cases: [ MatchCase { range: 19..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, value: Int( 1, @@ -46,14 +46,14 @@ Module( }, MatchCase { range: 31..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 36..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, value: Int( 2, @@ -66,11 +66,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap index 48a479382f..b12cc050bf 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap @@ -7,18 +7,18 @@ input_file: crates/ruff_python_parser/resources/inline/err/class_def_empty_body. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..31, body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, decorator_list: [], name: Identifier { id: Name("Foo"), range: 6..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: None, @@ -27,19 +27,19 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..23, decorator_list: [], name: Identifier { id: Name("Foo"), range: 17..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 20..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -49,12 +49,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..30, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("x"), ctx: Store, @@ -63,7 +63,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..30, value: Int( 42, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap index 6d68771f17..218b289dc4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap @@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/err/class_def_missing_nam ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..53, body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, decorator_list: [], name: Identifier { id: Name(""), range: 5..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..11, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..11, }, ), @@ -40,19 +40,19 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..25, decorator_list: [], name: Identifier { id: Name(""), range: 17..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 18..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -60,11 +60,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, }, ), @@ -75,34 +75,34 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..52, decorator_list: [], name: Identifier { id: Name(""), range: 31..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 32..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 33..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("metaclass"), range: 33..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..46, id: Name("ABC"), ctx: Load, @@ -115,11 +115,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap index 17f5d5b106..6f4c7aa2ed 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap @@ -7,32 +7,32 @@ input_file: crates/ruff_python_parser/resources/inline/err/class_def_unclosed_ty ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..41, body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..33, decorator_list: [], name: Identifier { id: Name("Foo"), range: 6..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 9..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 10..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T1"), range: 10..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -41,11 +41,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 14..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T2"), range: 15..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -56,11 +56,11 @@ Module( arguments: Some( Arguments { range: 17..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("a"), ctx: Load, @@ -68,7 +68,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, id: Name("b"), ctx: Load, @@ -81,7 +81,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..33, }, ), @@ -90,12 +90,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..40, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("x"), ctx: Store, @@ -104,7 +104,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..40, value: Int( 10, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap index 9d91dbf072..40c8001fee 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap @@ -7,42 +7,42 @@ input_file: crates/ruff_python_parser/resources/inline/err/class_type_params_py3 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..113, body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..95, decorator_list: [], name: Identifier { id: Name("Foo"), range: 50..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 53..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 54..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("S"), range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..69, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, id: Name("str"), ctx: Load, @@ -50,7 +50,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..68, id: Name("bytes"), ctx: Load, @@ -68,16 +68,16 @@ Module( TypeVar( TypeParamTypeVar { range: 71..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 71..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..79, id: Name("float"), ctx: Load, @@ -90,11 +90,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 81..84, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 82..84, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -102,11 +102,11 @@ Module( ParamSpec( TypeParamParamSpec { range: 86..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 88..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -118,11 +118,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..95, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..95, }, ), @@ -133,18 +133,18 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..112, decorator_list: [], name: Identifier { id: Name("Foo"), range: 102..105, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 105..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [], }, ), @@ -152,11 +152,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap index 52dcef4c18..32d4fbf051 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/clause_expect_indente ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..171, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..61, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..60, value: true, }, @@ -27,17 +27,17 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..66, }, ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..170, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..169, value: true, }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap index 0cec1c5726..f43fda3f90 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/clause_expect_single_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..23, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, value: true, }, @@ -27,11 +27,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..22, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..16, value: true, }, @@ -39,7 +39,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..22, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap index 749a5fa1ae..bf33de094f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/comma_separated_missi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 4..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..13, value: Int( 1, @@ -43,11 +43,11 @@ Module( keywords: [ Keyword { range: 5..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap index 3afc0336c3..5f39e94515 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/comma_separated_missi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..92, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..91, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..91, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..85, value: Int( 0, @@ -30,7 +30,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..88, value: Int( 1, @@ -39,7 +39,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap index 0e1f29a3c0..07e9b5e272 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/comma_separated_missi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, value: Int( 0, @@ -30,7 +30,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, value: Int( 1, @@ -39,7 +39,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap index 02c89d0035..5f23342613 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/comma_separated_missi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 4..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap index 636c0bdbac..aee9bf7056 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/comprehension_missing ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..6, id: Name("async"), ctx: Load, @@ -26,15 +26,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..27, value: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..27, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, id: Name("x"), ctx: Load, @@ -43,10 +43,10 @@ Module( generators: [ Comprehension { range: 11..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("x"), ctx: Store, @@ -54,7 +54,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..26, id: Name("iter"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap index 91477355a3..c69ff0c693 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap @@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_class.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..82, body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, decorator_list: [], name: Identifier { id: Name("__debug__"), range: 6..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, }, ), @@ -40,27 +40,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..58, decorator_list: [], name: Identifier { id: Name("C"), range: 41..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 42..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 43..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("__debug__"), range: 43..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -73,11 +73,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..58, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..58, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap index f31edee08a..9dbb166ca4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_function ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..125, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, is_async: false, decorator_list: [], name: Identifier { id: Name("__debug__"), range: 4..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 13..15, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,11 +35,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, }, ), @@ -52,28 +50,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..61, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 43..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 44..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("__debug__"), range: 44..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -84,9 +82,7 @@ Module( ), parameters: Parameters { range: 54..56, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -97,11 +93,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, }, ), @@ -112,33 +108,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..106, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 89..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 90..101, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 91..100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 91..100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("__debug__"), range: 91..100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -153,11 +147,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..106, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..106, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap index 380240dd33..0e59d7d457 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_import.p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..100, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, names: [ Alias { range: 7..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("__debug__"), range: 7..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -30,22 +30,22 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..42, names: [ Alias { range: 24..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("debug"), range: 24..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("__debug__"), range: 33..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -54,23 +54,23 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..66, module: Some( Identifier { id: Name("x"), range: 48..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 57..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("__debug__"), range: 57..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -80,29 +80,29 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..99, module: Some( Identifier { id: Name("x"), range: 72..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 81..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("debug"), range: 81..86, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("__debug__"), range: 90..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap index acb6dfcc11..16b505fcf9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_match.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..33, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..32, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -25,17 +25,17 @@ Module( cases: [ MatchCase { range: 13..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 18..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("__debug__"), range: 18..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -44,11 +44,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap index d638e10acc..1514d68600 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_try.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..44, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..43, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..8, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..8, }, ), @@ -32,11 +32,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 9..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..25, id: Name("Exception"), ctx: Load, @@ -47,17 +47,17 @@ Module( Identifier { id: Name("__debug__"), range: 29..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..43, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..43, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap index 06bce5209a..a39ffdd665 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_type_ali ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..95, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..14, id: Name("__debug__"), ctx: Store, @@ -25,11 +25,11 @@ Module( type_params: None, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..26, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..21, id: Name("list"), ctx: Load, @@ -37,7 +37,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, id: Name("int"), ctx: Load, @@ -50,11 +50,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..94, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..77, id: Name("Debug"), ctx: Store, @@ -63,16 +63,16 @@ Module( type_params: Some( TypeParams { range: 77..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 78..87, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("__debug__"), range: 78..87, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -83,7 +83,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..94, id: Name("str"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap index 3d0560bf59..0f9a6c4b23 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap @@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/err/debug_shadow_with.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..39, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, is_async: false, items: [ WithItem { range: 5..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..20, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..9, id: Name("open"), ctx: Load, @@ -33,17 +33,17 @@ Module( ), arguments: Arguments { range: 9..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..19, value: StringLiteralValue { inner: Single( StringLiteral { range: 10..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo.txt", flags: StringLiteralFlags { quote_style: Double, @@ -63,7 +63,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..33, id: Name("__debug__"), ctx: Store, @@ -75,11 +75,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..38, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..38, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap index 9b42c0f684..7ca2868d31 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_await_expre ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..96, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..95, is_async: true, decorator_list: [], name: Identifier { id: Name("foo"), range: 55..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 58..60, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,20 +35,20 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..95, is_async: false, decorator_list: [ Decorator { range: 66..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..76, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..76, id: Name("bar"), ctx: Load, @@ -63,14 +61,12 @@ Module( name: Identifier { id: Name("baz"), range: 85..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 88..90, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -81,11 +77,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..95, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..95, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap index 0262ed63aa..0dd32e14c7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap @@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_dict_litera ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..68, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..67, is_async: false, decorator_list: [ Decorator { range: 45..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..52, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, value: Int( 3, @@ -38,7 +38,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..51, value: Int( 3, @@ -54,14 +54,12 @@ Module( name: Identifier { id: Name("bar"), range: 57..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 60..62, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -72,11 +70,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..67, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..67, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap index 5d24f31dd4..b277f5a73a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap @@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_expression_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..89, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..88, is_async: false, decorator_list: [ Decorator { range: 45..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..72, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..64, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..56, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..53, id: Name("buttons"), ctx: Load, @@ -41,7 +41,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 0, @@ -54,7 +54,7 @@ Module( attr: Identifier { id: Name("clicked"), range: 57..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -62,7 +62,7 @@ Module( attr: Identifier { id: Name("connect"), range: 65..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -72,14 +72,12 @@ Module( name: Identifier { id: Name("spam"), range: 77..81, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 81..83, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -90,11 +88,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap index 666aa7e2ba..fe245de447 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_float_liter ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..66, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..65, is_async: false, decorator_list: [ Decorator { range: 45..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..50, value: Float( 3.14, @@ -33,14 +33,12 @@ Module( name: Identifier { id: Name("bar"), range: 55..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 58..60, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -51,11 +49,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..65, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..65, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap index a55f5868c2..b43a2254b9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap @@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_invalid_exp ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..56, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..55, is_async: false, decorator_list: [ Decorator { range: 0..3, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..3, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, id: Name("x"), ctx: Load, @@ -37,14 +37,14 @@ Module( }, Decorator { range: 4..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..8, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("x"), ctx: Load, @@ -56,14 +56,14 @@ Module( }, Decorator { range: 10..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..15, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("x"), ctx: Load, @@ -75,15 +75,15 @@ Module( }, Decorator { range: 18..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..26, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, id: Name("x"), ctx: Load, @@ -95,14 +95,14 @@ Module( }, Decorator { range: 27..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..40, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("x"), ctx: Load, @@ -115,14 +115,12 @@ Module( name: Identifier { id: Name("foo"), range: 45..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 48..50, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -133,11 +131,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..55, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..55, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap index 61a1b2b220..2c5bbd3a03 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_missing_exp ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..51, body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..15, target: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..8, id: Name("foo"), ctx: Load, @@ -28,7 +28,7 @@ Module( ), arguments: Arguments { range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -36,7 +36,7 @@ Module( ), annotation: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, }, ), @@ -46,16 +46,16 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..32, is_async: false, decorator_list: [ Decorator { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..17, id: Name(""), ctx: Invalid, @@ -66,14 +66,12 @@ Module( name: Identifier { id: Name("foo"), range: 22..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 25..27, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -84,11 +82,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, }, ), @@ -99,20 +97,20 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..50, is_async: false, decorator_list: [ Decorator { range: 33..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..34, id: Name(""), ctx: Invalid, @@ -121,7 +119,7 @@ Module( op: MatMult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..35, id: Name(""), ctx: Invalid, @@ -134,14 +132,12 @@ Module( name: Identifier { id: Name("foo"), range: 40..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 43..45, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -152,11 +148,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..50, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..50, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap index 88a78f186a..948fc24fe2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_missing_new ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..60, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, is_async: false, decorator_list: [ Decorator { range: 0..2, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, id: Name("x"), ctx: Load, @@ -32,14 +32,12 @@ Module( name: Identifier { id: Name("foo"), range: 7..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 10..12, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -50,11 +48,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, }, ), @@ -65,16 +63,16 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..41, is_async: true, decorator_list: [ Decorator { range: 18..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("x"), ctx: Load, @@ -85,14 +83,12 @@ Module( name: Identifier { id: Name("foo"), range: 31..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 34..36, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -103,11 +99,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..41, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..41, }, ), @@ -118,15 +114,15 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..59, decorator_list: [ Decorator { range: 42..44, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, id: Name("x"), ctx: Load, @@ -137,18 +133,18 @@ Module( name: Identifier { id: Name("Foo"), range: 51..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..59, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..59, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap index 0cbedb3919..b852c09115 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap @@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_named_expre ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..85, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..84, is_async: false, decorator_list: [ Decorator { range: 45..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..69, func: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..63, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Store, @@ -37,26 +37,24 @@ Module( ), value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..63, parameters: Some( Parameters { range: 59..60, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 59..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 59..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 59..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -70,7 +68,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("x"), ctx: Load, @@ -82,11 +80,11 @@ Module( ), arguments: Arguments { range: 64..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..68, id: Name("foo"), ctx: Load, @@ -102,14 +100,12 @@ Module( name: Identifier { id: Name("bar"), range: 74..77, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 77..79, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -120,11 +116,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap index 4172d61656..2429e4f3fd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap @@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_non_topleve ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..73, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..72, is_async: false, decorator_list: [ Decorator { range: 45..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..57, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..55, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..51, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..49, id: Name("foo"), ctx: Load, @@ -41,7 +41,7 @@ Module( ), arguments: Arguments { range: 49..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -50,14 +50,14 @@ Module( attr: Identifier { id: Name("bar"), range: 52..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 55..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -68,14 +68,12 @@ Module( name: Identifier { id: Name("baz"), range: 62..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 65..67, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -86,11 +84,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..72, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..72, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap index d76a5c7bff..a2e7b51517 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/decorator_unexpected_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..34, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..22, is_async: true, items: [ WithItem { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("x"), ctx: Load, @@ -33,11 +33,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, }, ), @@ -48,12 +48,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..33, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, id: Name("x"), ctx: Store, @@ -62,7 +62,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap index 40a5517f37..83f2d82287 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/del_debug_py39.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..57, body: [ Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..56, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..56, id: Name("__debug__"), ctx: Del, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap index 2e3f2be0af..1ea6b54337 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/del_incomplete_target ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, body: [ Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Del, @@ -25,11 +25,11 @@ Module( ), Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..9, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("y"), ctx: Load, @@ -38,7 +38,7 @@ Module( attr: Identifier { id: Name(""), range: 9..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Del, }, @@ -48,11 +48,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("z"), ctx: Load, @@ -62,12 +62,12 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..24, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("x"), ctx: Del, @@ -75,11 +75,11 @@ Module( ), Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..23, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("y"), ctx: Load, @@ -87,12 +87,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, lower: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("z"), ctx: Load, @@ -102,7 +102,7 @@ Module( upper: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..23, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap index 412384af7c..a769520c8a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap @@ -7,12 +7,12 @@ input_file: crates/ruff_python_parser/resources/inline/err/del_stmt_empty.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, body: [ Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, targets: [], }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap index 3614aa08aa..06b5f87daa 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/dotted_name_multiple_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..25, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, names: [ Alias { range: 7..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a..b"), range: 7..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -30,16 +30,16 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..20, names: [ Alias { range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -48,11 +48,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, }, ), @@ -60,11 +60,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("b"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap index 950b30f63d..4a2eefcbc8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/duplicate_match_class ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..231, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..230, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -25,14 +25,14 @@ Module( cases: [ MatchCase { range: 13..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 18..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..23, id: Name("Class"), ctx: Load, @@ -40,24 +40,24 @@ Module( ), arguments: PatternArguments { range: 23..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 24..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 26..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, value: Int( 1, @@ -69,19 +69,19 @@ Module( }, PatternKeyword { range: 29..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 31..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..32, value: Int( 2, @@ -99,11 +99,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..38, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..38, }, ), @@ -113,19 +113,19 @@ Module( }, MatchCase { range: 43..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 48..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchClass( PatternMatchClass { range: 49..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..54, id: Name("Class"), ctx: Load, @@ -133,24 +133,24 @@ Module( ), arguments: PatternArguments { range: 54..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 55..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 55..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 57..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, value: Int( 1, @@ -162,19 +162,19 @@ Module( }, PatternKeyword { range: 60..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 62..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, value: Int( 2, @@ -195,11 +195,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..70, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..70, }, ), @@ -209,21 +209,21 @@ Module( }, MatchCase { range: 75..113, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 80..108, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, value: StringLiteralValue { inner: Single( StringLiteral { range: 81..84, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -237,13 +237,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..92, value: StringLiteralValue { inner: Single( StringLiteral { range: 89..92, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "y", flags: StringLiteralFlags { quote_style: Double, @@ -260,13 +260,13 @@ Module( MatchAs( PatternMatchAs { range: 86..87, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 86..87, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -274,10 +274,10 @@ Module( MatchClass( PatternMatchClass { range: 94..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..97, id: Name("Foo"), ctx: Load, @@ -285,24 +285,24 @@ Module( ), arguments: PatternArguments { range: 97..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 98..101, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 98..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 100..101, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, value: Int( 1, @@ -314,19 +314,19 @@ Module( }, PatternKeyword { range: 103..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 103..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 105..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, value: Int( 2, @@ -348,11 +348,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..113, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..113, }, ), @@ -362,16 +362,16 @@ Module( }, MatchCase { range: 118..162, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 123..157, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchMapping( PatternMatchMapping { range: 124..126, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: None, @@ -380,17 +380,17 @@ Module( MatchMapping( PatternMatchMapping { range: 128..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..132, value: StringLiteralValue { inner: Single( StringLiteral { range: 129..132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -404,13 +404,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..140, value: StringLiteralValue { inner: Single( StringLiteral { range: 137..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "y", flags: StringLiteralFlags { quote_style: Double, @@ -427,13 +427,13 @@ Module( MatchAs( PatternMatchAs { range: 134..135, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 134..135, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -441,10 +441,10 @@ Module( MatchClass( PatternMatchClass { range: 142..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..145, id: Name("Foo"), ctx: Load, @@ -452,24 +452,24 @@ Module( ), arguments: PatternArguments { range: 145..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 146..149, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 146..147, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 148..149, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..149, value: Int( 1, @@ -481,19 +481,19 @@ Module( }, PatternKeyword { range: 151..154, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 151..152, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 153..154, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..154, value: Int( 2, @@ -518,11 +518,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..162, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..162, }, ), @@ -532,14 +532,14 @@ Module( }, MatchCase { range: 167..230, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 172..225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..177, id: Name("Class"), ctx: Load, @@ -547,24 +547,24 @@ Module( ), arguments: PatternArguments { range: 177..225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 178..181, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 178..179, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 180..181, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 180..181, value: Int( 1, @@ -576,26 +576,26 @@ Module( }, PatternKeyword { range: 183..201, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("d"), range: 183..184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchMapping( PatternMatchMapping { range: 185..201, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..189, value: StringLiteralValue { inner: Single( StringLiteral { range: 186..189, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -609,13 +609,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..197, value: StringLiteralValue { inner: Single( StringLiteral { range: 194..197, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -632,10 +632,10 @@ Module( MatchValue( PatternMatchValue { range: 191..192, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..192, value: Int( 1, @@ -647,10 +647,10 @@ Module( MatchValue( PatternMatchValue { range: 199..200, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..200, value: Int( 2, @@ -666,19 +666,19 @@ Module( }, PatternKeyword { range: 203..224, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("other"), range: 203..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchClass( PatternMatchClass { range: 209..224, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 209..214, id: Name("Class"), ctx: Load, @@ -686,24 +686,24 @@ Module( ), arguments: PatternArguments { range: 214..224, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 215..218, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 215..216, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 217..218, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..218, value: Int( 1, @@ -715,19 +715,19 @@ Module( }, PatternKeyword { range: 220..223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 220..221, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 222..223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..223, value: Int( 2, @@ -750,11 +750,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..230, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..230, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap index 4cfbb7011e..34974c55b0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/duplicate_match_key.p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..533, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..532, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -25,21 +25,21 @@ Module( cases: [ MatchCase { range: 13..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 18..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, value: StringLiteralValue { inner: Single( StringLiteral { range: 19..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -53,13 +53,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..30, value: StringLiteralValue { inner: Single( StringLiteral { range: 27..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -76,10 +76,10 @@ Module( MatchValue( PatternMatchValue { range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, value: Int( 1, @@ -91,10 +91,10 @@ Module( MatchValue( PatternMatchValue { range: 32..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, value: Int( 2, @@ -111,11 +111,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..39, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..39, }, ), @@ -125,21 +125,21 @@ Module( }, MatchCase { range: 44..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 49..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..54, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 50..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 120, ], @@ -155,13 +155,13 @@ Module( ), BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..63, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 59..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 120, ], @@ -180,10 +180,10 @@ Module( MatchValue( PatternMatchValue { range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, value: Int( 1, @@ -195,10 +195,10 @@ Module( MatchValue( PatternMatchValue { range: 65..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, value: Int( 2, @@ -215,11 +215,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..72, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..72, }, ), @@ -229,15 +229,15 @@ Module( }, MatchCase { range: 77..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 82..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, value: Int( 0, @@ -246,7 +246,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, value: Int( 0, @@ -258,10 +258,10 @@ Module( MatchValue( PatternMatchValue { range: 86..87, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..87, value: Int( 1, @@ -273,10 +273,10 @@ Module( MatchValue( PatternMatchValue { range: 92..93, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..93, value: Int( 2, @@ -293,11 +293,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, }, ), @@ -307,15 +307,15 @@ Module( }, MatchCase { range: 104..130, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 109..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..113, value: Float( 1.0, @@ -324,7 +324,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..121, value: Float( 1.0, @@ -336,10 +336,10 @@ Module( MatchValue( PatternMatchValue { range: 115..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..116, value: Int( 1, @@ -351,10 +351,10 @@ Module( MatchValue( PatternMatchValue { range: 123..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..124, value: Int( 2, @@ -371,11 +371,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..130, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..130, }, ), @@ -385,19 +385,19 @@ Module( }, MatchCase { range: 135..171, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 140..166, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..149, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..144, value: Float( 1.0, @@ -407,7 +407,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..149, value: Complex { real: 0.0, @@ -419,11 +419,11 @@ Module( ), BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..162, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..157, value: Float( 1.0, @@ -433,7 +433,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..162, value: Complex { real: 0.0, @@ -448,10 +448,10 @@ Module( MatchValue( PatternMatchValue { range: 151..152, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..152, value: Int( 1, @@ -463,10 +463,10 @@ Module( MatchValue( PatternMatchValue { range: 164..165, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..165, value: Int( 2, @@ -483,11 +483,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..171, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..171, }, ), @@ -497,22 +497,22 @@ Module( }, MatchCase { range: 176..204, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 181..199, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..186, value: true, }, ), BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..195, value: true, }, @@ -522,10 +522,10 @@ Module( MatchValue( PatternMatchValue { range: 188..189, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..189, value: Int( 1, @@ -537,10 +537,10 @@ Module( MatchValue( PatternMatchValue { range: 197..198, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..198, value: Int( 2, @@ -557,11 +557,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..204, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..204, }, ), @@ -571,21 +571,21 @@ Module( }, MatchCase { range: 209..237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 214..232, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..219, }, ), NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..228, }, ), @@ -594,10 +594,10 @@ Module( MatchValue( PatternMatchValue { range: 221..222, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..222, value: Int( 1, @@ -609,10 +609,10 @@ Module( MatchValue( PatternMatchValue { range: 230..231, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..231, value: Int( 2, @@ -629,11 +629,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..237, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..237, }, ), @@ -643,21 +643,21 @@ Module( }, MatchCase { range: 242..319, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 247..314, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..277, value: StringLiteralValue { inner: Single( StringLiteral { range: 253..277, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x\n y\n z\n ", flags: StringLiteralFlags { quote_style: Double, @@ -671,13 +671,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..310, value: StringLiteralValue { inner: Single( StringLiteral { range: 286..310, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x\n y\n z\n ", flags: StringLiteralFlags { quote_style: Double, @@ -694,10 +694,10 @@ Module( MatchValue( PatternMatchValue { range: 279..280, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 279..280, value: Int( 1, @@ -709,10 +709,10 @@ Module( MatchValue( PatternMatchValue { range: 312..313, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..313, value: Int( 2, @@ -729,11 +729,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 316..319, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 316..319, }, ), @@ -743,21 +743,21 @@ Module( }, MatchCase { range: 324..358, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 329..353, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 330..333, value: StringLiteralValue { inner: Single( StringLiteral { range: 330..333, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -771,13 +771,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 338..341, value: StringLiteralValue { inner: Single( StringLiteral { range: 338..341, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -791,13 +791,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 346..349, value: StringLiteralValue { inner: Single( StringLiteral { range: 346..349, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -814,10 +814,10 @@ Module( MatchValue( PatternMatchValue { range: 335..336, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..336, value: Int( 1, @@ -829,10 +829,10 @@ Module( MatchValue( PatternMatchValue { range: 343..344, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 343..344, value: Int( 2, @@ -844,10 +844,10 @@ Module( MatchValue( PatternMatchValue { range: 351..352, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..352, value: Int( 3, @@ -864,11 +864,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 355..358, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 355..358, }, ), @@ -878,15 +878,15 @@ Module( }, MatchCase { range: 363..401, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 368..396, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 369..370, value: Int( 0, @@ -895,13 +895,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 375..378, value: StringLiteralValue { inner: Single( StringLiteral { range: 375..378, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -915,7 +915,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..384, value: Int( 0, @@ -924,13 +924,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 389..392, value: StringLiteralValue { inner: Single( StringLiteral { range: 389..392, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -947,10 +947,10 @@ Module( MatchValue( PatternMatchValue { range: 372..373, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 372..373, value: Int( 1, @@ -962,10 +962,10 @@ Module( MatchValue( PatternMatchValue { range: 380..381, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 380..381, value: Int( 1, @@ -977,10 +977,10 @@ Module( MatchValue( PatternMatchValue { range: 386..387, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 386..387, value: Int( 2, @@ -992,10 +992,10 @@ Module( MatchValue( PatternMatchValue { range: 394..395, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 394..395, value: Int( 2, @@ -1012,11 +1012,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 398..401, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 398..401, }, ), @@ -1026,26 +1026,26 @@ Module( }, MatchCase { range: 406..434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 411..429, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchMapping( PatternMatchMapping { range: 412..428, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 413..416, value: StringLiteralValue { inner: Single( StringLiteral { range: 413..416, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -1059,13 +1059,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..424, value: StringLiteralValue { inner: Single( StringLiteral { range: 421..424, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -1082,10 +1082,10 @@ Module( MatchValue( PatternMatchValue { range: 418..419, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 418..419, value: Int( 1, @@ -1097,10 +1097,10 @@ Module( MatchValue( PatternMatchValue { range: 426..427, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 426..427, value: Int( 2, @@ -1120,11 +1120,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 431..434, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 431..434, }, ), @@ -1134,14 +1134,14 @@ Module( }, MatchCase { range: 439..477, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 444..472, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 444..447, id: Name("Foo"), ctx: Load, @@ -1149,24 +1149,24 @@ Module( ), arguments: PatternArguments { range: 447..472, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 448..451, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 448..449, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 450..451, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 450..451, value: Int( 1, @@ -1178,26 +1178,26 @@ Module( }, PatternKeyword { range: 453..471, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("y"), range: 453..454, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchMapping( PatternMatchMapping { range: 455..471, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 456..459, value: StringLiteralValue { inner: Single( StringLiteral { range: 456..459, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -1211,13 +1211,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 464..467, value: StringLiteralValue { inner: Single( StringLiteral { range: 464..467, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -1234,10 +1234,10 @@ Module( MatchValue( PatternMatchValue { range: 461..462, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 461..462, value: Int( 1, @@ -1249,10 +1249,10 @@ Module( MatchValue( PatternMatchValue { range: 469..470, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 469..470, value: Int( 2, @@ -1274,11 +1274,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 474..477, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 474..477, }, ), @@ -1288,19 +1288,19 @@ Module( }, MatchCase { range: 482..532, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 487..527, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchClass( PatternMatchClass { range: 488..496, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 488..491, id: Name("Foo"), ctx: Load, @@ -1308,24 +1308,24 @@ Module( ), arguments: PatternArguments { range: 491..496, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 492..495, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 492..493, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 494..495, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 494..495, value: Int( 1, @@ -1342,10 +1342,10 @@ Module( MatchClass( PatternMatchClass { range: 498..526, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 498..501, id: Name("Foo"), ctx: Load, @@ -1353,24 +1353,24 @@ Module( ), arguments: PatternArguments { range: 501..526, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 502..505, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 502..503, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 504..505, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 504..505, value: Int( 1, @@ -1382,26 +1382,26 @@ Module( }, PatternKeyword { range: 507..525, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("y"), range: 507..508, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchMapping( PatternMatchMapping { range: 509..525, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 510..513, value: StringLiteralValue { inner: Single( StringLiteral { range: 510..513, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -1415,13 +1415,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 518..521, value: StringLiteralValue { inner: Single( StringLiteral { range: 518..521, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Double, @@ -1438,10 +1438,10 @@ Module( MatchValue( PatternMatchValue { range: 515..516, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 515..516, value: Int( 1, @@ -1453,10 +1453,10 @@ Module( MatchValue( PatternMatchValue { range: 523..524, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 523..524, value: Int( 2, @@ -1481,11 +1481,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 529..532, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 529..532, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap index 55e020ad84..852f2656e0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/duplicate_type_parame ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..261, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, id: Name("Alias"), ctx: Store, @@ -25,16 +25,16 @@ Module( type_params: Some( TypeParams { range: 10..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -43,11 +43,11 @@ Module( TypeVar( TypeParamTypeVar { range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -58,7 +58,7 @@ Module( ), value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, }, ), @@ -66,28 +66,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..45, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 27..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 28..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -96,11 +96,11 @@ Module( TypeVar( TypeParamTypeVar { range: 32..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 32..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -111,26 +111,24 @@ Module( ), parameters: Parameters { range: 34..40, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 35..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 35..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("t"), range: 35..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("T"), ctx: Load, @@ -149,11 +147,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..45, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..45, }, ), @@ -164,27 +162,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..64, decorator_list: [], name: Identifier { id: Name("C"), range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 53..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -193,11 +191,11 @@ Module( TypeVar( TypeParamTypeVar { range: 57..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 57..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -210,11 +208,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..64, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..64, }, ), @@ -225,11 +223,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..132, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..75, id: Name("Alias"), ctx: Store, @@ -238,16 +236,16 @@ Module( type_params: Some( TypeParams { range: 75..126, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 76..77, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 76..77, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -256,16 +254,16 @@ Module( TypeVar( TypeParamTypeVar { range: 79..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("U"), range: 79..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..85, id: Name("str"), ctx: Load, @@ -278,21 +276,21 @@ Module( TypeVar( TypeParamTypeVar { range: 87..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("V"), range: 87..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..102, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..94, id: Name("str"), ctx: Load, @@ -300,7 +298,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..101, id: Name("bytes"), ctx: Load, @@ -318,11 +316,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 104..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 105..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -330,11 +328,11 @@ Module( ParamSpec( TypeParamParamSpec { range: 109..112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 111..112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -342,17 +340,17 @@ Module( TypeVar( TypeParamTypeVar { range: 114..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 114..115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..125, id: Name("default"), ctx: Load, @@ -366,7 +364,7 @@ Module( ), value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..132, }, ), @@ -374,28 +372,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..154, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 137..138, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 138..147, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 139..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 139..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -404,11 +402,11 @@ Module( TypeVar( TypeParamTypeVar { range: 142..143, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 142..143, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -417,11 +415,11 @@ Module( TypeVar( TypeParamTypeVar { range: 145..146, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 145..146, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -432,9 +430,7 @@ Module( ), parameters: Parameters { range: 147..149, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -445,11 +441,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..154, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..154, }, ), @@ -460,28 +456,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..188, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 173..174, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 174..181, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 175..176, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 175..176, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -490,11 +486,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 178..180, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 179..180, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -504,9 +500,7 @@ Module( ), parameters: Parameters { range: 181..183, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -517,11 +511,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..188, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..188, }, ), @@ -532,28 +526,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 218..238, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 222..223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 223..231, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 224..225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 224..225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -562,11 +556,11 @@ Module( ParamSpec( TypeParamParamSpec { range: 227..230, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 229..230, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -576,9 +570,7 @@ Module( ), parameters: Parameters { range: 231..233, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -589,11 +581,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..238, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..238, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap index 0530c751f8..668f37596b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_star_py310.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..126, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..125, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, }, ), @@ -32,11 +32,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 53..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..71, id: Name("ValueError"), ctx: Load, @@ -47,11 +47,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..76, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..76, }, ), @@ -63,11 +63,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 77..98, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..93, id: Name("KeyError"), ctx: Load, @@ -78,11 +78,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..98, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..98, }, ), @@ -94,11 +94,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 99..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..120, id: Name("Error"), ctx: Load, @@ -109,11 +109,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..125, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..125, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap index fb1f2b6181..475b5a7e2c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_invalid_e ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..74, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -26,16 +26,16 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 14..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..28, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("x"), ctx: Load, @@ -49,7 +49,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..38, }, ), @@ -64,12 +64,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..73, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..52, }, ), @@ -78,15 +78,15 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 53..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..63, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("x"), ctx: Load, @@ -100,7 +100,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..73, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap index b9b370d139..bdc389bfcd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_missing_a ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..73, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..72, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -26,11 +26,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 14..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..30, id: Name("Exception"), ctx: Load, @@ -41,7 +41,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..43, }, ), @@ -51,11 +51,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 44..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..60, id: Name("Exception"), ctx: Load, @@ -66,7 +66,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..72, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap index fa14993f79..e3f602dd24 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_missing_e ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..166, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..37, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -26,19 +26,19 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 14..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: Some( Identifier { id: Name("exc"), range: 24..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..37, }, ), @@ -53,12 +53,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..165, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..105, }, ), @@ -67,13 +67,13 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 106..123, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..123, }, ), @@ -83,13 +83,13 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 124..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..140, }, ), @@ -99,19 +99,19 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 141..165, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: Some( Identifier { id: Name("exc"), range: 152..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 161..165, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap index fc9b78dde0..fe8b15dd88 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_missing_e ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..34, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..33, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -26,13 +26,13 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 14..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..33, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap index ddc722c892..153f50e02e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_unparenth ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..86, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..42, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -26,16 +26,16 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 14..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..25, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, id: Name("x"), ctx: Load, @@ -43,7 +43,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("y"), ctx: Load, @@ -59,13 +59,13 @@ Module( Identifier { id: Name("exc"), range: 29..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..42, }, ), @@ -80,12 +80,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..85, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..56, }, ), @@ -94,16 +94,16 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 57..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..69, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, id: Name("x"), ctx: Load, @@ -111,7 +111,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("y"), ctx: Load, @@ -127,13 +127,13 @@ Module( Identifier { id: Name("eg"), range: 73..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..85, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap index 848e2c1299..671eed373c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/except_stmt_unparenth ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..117, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..79, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..57, }, ), @@ -26,16 +26,16 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 58..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..69, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, id: Name("x"), ctx: Load, @@ -43,7 +43,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("y"), ctx: Load, @@ -59,7 +59,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..79, }, ), @@ -74,12 +74,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..116, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..93, }, ), @@ -88,16 +88,16 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 94..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..106, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, id: Name("x"), ctx: Load, @@ -105,7 +105,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, id: Name("y"), ctx: Load, @@ -121,7 +121,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..116, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap index 0637b78f08..e3f633b879 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/do ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..55, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,21 +28,21 @@ Module( ), arguments: Arguments { range: 4..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 5..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..14, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("x"), ctx: Load, @@ -60,15 +60,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..27, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..27, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..20, id: Name("call"), ctx: Load, @@ -76,20 +76,20 @@ Module( ), arguments: Arguments { range: 20..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 21..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..26, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, id: Name("x"), ctx: Load, @@ -107,15 +107,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..38, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..38, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..32, id: Name("call"), ctx: Load, @@ -123,20 +123,20 @@ Module( ), arguments: Arguments { range: 32..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 33..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..37, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, id: Name("x"), ctx: Load, @@ -154,15 +154,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..54, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..54, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..44, id: Name("call"), ctx: Load, @@ -170,11 +170,11 @@ Module( ), arguments: Arguments { range: 44..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, value: Int( 1, @@ -185,11 +185,11 @@ Module( keywords: [ Keyword { range: 45..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap index 6e6e7699e2..9f5a0cfa41 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/du ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, id: Name("foo"), ctx: Load, @@ -28,22 +28,22 @@ Module( ), arguments: Arguments { range: 3..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("a"), range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, value: Int( 1, @@ -53,17 +53,17 @@ Module( }, Keyword { range: 9..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("b"), range: 9..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, value: Int( 2, @@ -73,17 +73,17 @@ Module( }, Keyword { range: 14..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("c"), range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, value: Int( 3, @@ -93,17 +93,17 @@ Module( }, Keyword { range: 19..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("b"), range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, value: Int( 4, @@ -113,17 +113,17 @@ Module( }, Keyword { range: 24..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("a"), range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, value: Int( 5, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap index e517103c14..1e7f4b6192 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/in ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..67, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,22 +28,22 @@ Module( ), arguments: Arguments { range: 4..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 5..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name(""), range: 5..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, value: Int( 1, @@ -59,15 +59,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..32, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..32, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..20, id: Name("call"), ctx: Load, @@ -75,22 +75,22 @@ Module( ), arguments: Arguments { range: 20..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 21..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name(""), range: 21..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..31, value: Int( 1, @@ -106,15 +106,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..47, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..47, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..38, id: Name("call"), ctx: Load, @@ -122,16 +122,16 @@ Module( ), arguments: Arguments { range: 38..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..46, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..46, id: Name("x"), ctx: Load, @@ -149,15 +149,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..66, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..66, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..52, id: Name("call"), ctx: Load, @@ -165,15 +165,15 @@ Module( ), arguments: Arguments { range: 52..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..65, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..65, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap index 99643af80e..00502dd679 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/in ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..69, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,27 +28,27 @@ Module( ), arguments: Arguments { range: 4..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 5..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 5..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..16, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, id: Name("y"), ctx: Load, @@ -66,15 +66,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..40, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..40, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..22, id: Name("call"), ctx: Load, @@ -82,26 +82,26 @@ Module( ), arguments: Arguments { range: 22..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 23..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 23..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..39, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("y"), ctx: Load, @@ -118,15 +118,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..53, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..53, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..45, id: Name("call"), ctx: Load, @@ -134,26 +134,26 @@ Module( ), arguments: Arguments { range: 45..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 46..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 46..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..52, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, id: Name("y"), ctx: Load, @@ -171,15 +171,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..68, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..68, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..58, id: Name("call"), ctx: Load, @@ -187,26 +187,26 @@ Module( ), arguments: Arguments { range: 58..68, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 59..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 59..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..66, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap index 2b60be9235..90c44de37c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/in ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..100, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 4..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, id: Name("x"), ctx: Load, @@ -42,11 +42,11 @@ Module( keywords: [ Keyword { range: 5..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..13, id: Name("kwargs"), ctx: Load, @@ -61,15 +61,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..30, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..30, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..22, id: Name("call"), ctx: Load, @@ -77,11 +77,11 @@ Module( ), arguments: Arguments { range: 22..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, id: Name("y"), ctx: Load, @@ -91,17 +91,17 @@ Module( keywords: [ Keyword { range: 23..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 23..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, value: Int( 1, @@ -117,15 +117,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..53, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..53, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..35, id: Name("call"), ctx: Load, @@ -133,11 +133,11 @@ Module( ), arguments: Arguments { range: 35..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, id: Name("y"), ctx: Load, @@ -147,17 +147,17 @@ Module( keywords: [ Keyword { range: 36..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 36..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, value: Int( 1, @@ -167,11 +167,11 @@ Module( }, Keyword { range: 41..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..49, id: Name("kwargs"), ctx: Load, @@ -186,15 +186,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..75, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..75, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..58, id: Name("call"), ctx: Load, @@ -202,15 +202,15 @@ Module( ), arguments: Arguments { range: 58..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..74, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..74, id: Name("args"), ctx: Load, @@ -223,11 +223,11 @@ Module( keywords: [ Keyword { range: 59..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..67, id: Name("kwargs"), ctx: Load, @@ -242,15 +242,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..99, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..99, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..80, id: Name("call"), ctx: Load, @@ -258,15 +258,15 @@ Module( ), arguments: Arguments { range: 80..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..97, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..97, id: Name("args"), ctx: Load, @@ -279,11 +279,11 @@ Module( keywords: [ Keyword { range: 81..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..89, id: Name("kwargs"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap index bade10dafe..42fd265361 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/mi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 4..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Load, @@ -40,7 +40,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap index a17128ef2c..37e891b89a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/mi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 4..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Load, @@ -40,7 +40,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap index 1b515e8f95..83e062828f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/mi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 4..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, value: Int( 1, @@ -48,15 +48,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..21, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..21, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..15, id: Name("call"), ctx: Load, @@ -64,22 +64,22 @@ Module( ), arguments: Arguments { range: 15..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 16..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..19, id: Name(""), ctx: Invalid, @@ -94,15 +94,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..32, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..32, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..26, id: Name("call"), ctx: Load, @@ -110,15 +110,15 @@ Module( ), arguments: Arguments { range: 26..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..28, id: Name(""), ctx: Invalid, @@ -129,7 +129,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..31, id: Name("y"), ctx: Load, @@ -144,11 +144,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..37, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..37, id: Name("foo"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap index d9a820dcd8..d4e8773726 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/st ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..64, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,19 +28,19 @@ Module( ), arguments: Arguments { range: 4..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..27, elt: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..10, id: Name("data"), ctx: Load, @@ -52,10 +52,10 @@ Module( generators: [ Comprehension { range: 11..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..19, id: Name("data"), ctx: Store, @@ -63,7 +63,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..27, id: Name("iter"), ctx: Load, @@ -85,15 +85,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..43, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..43, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..33, id: Name("call"), ctx: Load, @@ -101,20 +101,20 @@ Module( ), arguments: Arguments { range: 33..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..42, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..42, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("x"), ctx: Load, @@ -135,15 +135,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..63, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..63, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..48, id: Name("call"), ctx: Load, @@ -151,19 +151,19 @@ Module( ), arguments: Arguments { range: 48..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..62, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..62, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..62, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap index 6eab954049..655f45ed24 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/un ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,7 +28,7 @@ Module( ), arguments: Arguments { range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -38,21 +38,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..26, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 11..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 14..16, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -63,7 +61,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..26, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap index d60f2bf871..99e0e4fbcd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/un ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..27, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 4..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Load, @@ -47,21 +47,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..27, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 12..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 15..17, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -72,7 +70,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..27, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap index ee3456db28..2b4270bf2c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/arguments/un ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Load, @@ -47,21 +47,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..28, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 13..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 16..18, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -72,7 +70,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..28, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap index f2eec9b2cb..67ca493c7d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/attribute/in ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -26,11 +26,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..3, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..3, value: Float( 0.1, @@ -41,11 +41,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Load, @@ -55,11 +55,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..7, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..7, value: Float( 0.1, @@ -70,11 +70,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..9, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..9, value: Float( 0.0, @@ -85,19 +85,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..15, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..15, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..12, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("x"), ctx: Load, @@ -106,14 +106,14 @@ Module( attr: Identifier { id: Name(""), range: 12..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, value: Int( 0, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap index efa04a319e..cbbf28892a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/attribute/mu ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..46, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, id: Name("extra"), ctx: Load, @@ -33,7 +33,7 @@ Module( attr: Identifier { id: Name(""), range: 6..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -41,7 +41,7 @@ Module( attr: Identifier { id: Name("dot"), range: 7..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -50,11 +50,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..19, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..19, id: Name("multiple"), ctx: Load, @@ -64,22 +64,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..27, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..27, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, }, ), attr: Identifier { id: Name("dots"), range: 23..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -88,11 +88,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..36, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..36, id: Name("multiple"), ctx: Load, @@ -102,26 +102,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..45, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..45, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..40, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..39, }, ), attr: Identifier { id: Name(""), range: 40..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -129,7 +129,7 @@ Module( attr: Identifier { id: Name("dots"), range: 41..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap index 69af9f8041..04634b6766 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/attribute/no ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..141, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..93, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..93, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..92, id: Name("first"), ctx: Load, @@ -29,7 +29,7 @@ Module( attr: Identifier { id: Name(""), range: 93..93, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -38,11 +38,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..100, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..100, id: Name("second"), ctx: Load, @@ -52,15 +52,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..141, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..141, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..140, id: Name("last"), ctx: Load, @@ -69,7 +69,7 @@ Module( attr: Identifier { id: Name(""), range: 141..141, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap index f1e8020d1a..f9683c9fe6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/await/no_exp ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..73, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..66, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..66, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..66, id: Name(""), ctx: Invalid, @@ -32,15 +32,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..73, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..73, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Load, @@ -49,7 +49,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap index cf7d31d11b..10da259bcc 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/await/no_exp ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..85, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..64, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..64, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..64, id: Name(""), ctx: Invalid, @@ -32,21 +32,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..85, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 70..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 73..75, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -57,7 +55,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..85, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap index 029e1723d9..3eb3479394 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/await/recove ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..284, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..130, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..130, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..130, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, id: Name("x"), ctx: Load, @@ -38,19 +38,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..162, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..162, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..162, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 161..162, id: Name("x"), ctx: Load, @@ -65,19 +65,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..173, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..173, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..172, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..172, id: Name("x"), ctx: Load, @@ -92,20 +92,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..227, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..227, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..227, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..227, id: Name("x"), ctx: Load, @@ -120,34 +120,32 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..245, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..245, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..245, parameters: Some( Parameters { range: 241..242, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 241..242, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 241..242, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 241..242, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -161,7 +159,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 244..245, id: Name("x"), ctx: Load, @@ -175,20 +173,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..254, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..254, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 252..254, op: UAdd, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..254, id: Name("x"), ctx: Load, @@ -202,20 +200,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..263, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..263, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 261..263, op: USub, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 262..263, id: Name("x"), ctx: Load, @@ -229,20 +227,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..272, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..272, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 270..272, op: Invert, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..272, id: Name("x"), ctx: Load, @@ -256,20 +254,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 273..284, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 273..284, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 279..284, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 283..284, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap index fa628602c1..41d9904805 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/inval ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -29,26 +29,24 @@ Module( op: Add, right: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..15, parameters: Some( Parameters { range: 11..12, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -62,7 +60,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("y"), ctx: Load, @@ -76,15 +74,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..28, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..28, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("x"), ctx: Load, @@ -93,12 +91,12 @@ Module( op: Sub, right: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..28, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap index b9bd494cd7..1ba50a5e82 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/missi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, id: Name("y"), ctx: Load, @@ -26,15 +26,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, value: Int( 1, @@ -44,7 +44,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap index ab67484feb..baf12f2136 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/missi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, value: Int( 0, @@ -30,7 +30,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..3, id: Name(""), ctx: Invalid, @@ -42,15 +42,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, value: Int( 1, @@ -60,7 +60,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap index 9357c59dc3..1b39f2bac0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/missi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, value: Int( 1, @@ -34,7 +34,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, value: Int( 2, @@ -46,11 +46,11 @@ Module( op: Sub, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..11, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, value: Int( 3, @@ -60,7 +60,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..11, id: Name(""), ctx: Invalid, @@ -74,15 +74,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..18, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..18, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, value: Int( 4, @@ -92,7 +92,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, value: Int( 5, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap index 41adb471bf..cf81983e85 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/multi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -29,12 +29,12 @@ Module( op: Add, right: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, op: UAdd, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..3, id: Name(""), ctx: Invalid, @@ -48,15 +48,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..9, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..9, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, value: Int( 1, @@ -66,7 +66,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, value: Int( 2, @@ -79,15 +79,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..13, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..13, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("x"), ctx: Load, @@ -96,12 +96,12 @@ Module( op: Sub, right: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..13, op: USub, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..13, id: Name(""), ctx: Invalid, @@ -115,15 +115,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..19, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..19, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, value: Int( 1, @@ -133,7 +133,7 @@ Module( op: Sub, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap index 475add5dc2..8293f4b759 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/named ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -29,7 +29,7 @@ Module( op: Sub, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("y"), ctx: Load, @@ -41,16 +41,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..15, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..15, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, value: Int( 1, @@ -59,7 +59,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, value: Int( 2, @@ -75,15 +75,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..21, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..21, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("x"), ctx: Load, @@ -92,7 +92,7 @@ Module( op: Div, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, id: Name("y"), ctx: Load, @@ -104,11 +104,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap index 3fc18497c4..5080466f7f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bin_op/starr ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -29,11 +29,11 @@ Module( op: Add, right: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..6, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("y"), ctx: Load, @@ -48,15 +48,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..14, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..14, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("x"), ctx: Load, @@ -65,11 +65,11 @@ Module( op: Pow, right: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..14, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap index a3515f3a7f..8f10231161 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bool_op/inva ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..31, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -30,26 +30,24 @@ Module( ), Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..17, parameters: Some( Parameters { range: 13..14, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 13..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 13..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 13..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -63,7 +61,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("y"), ctx: Load, @@ -78,17 +76,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..31, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..31, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("x"), ctx: Load, @@ -96,12 +94,12 @@ Module( ), Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..31, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..31, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap index 68ff71e827..7becb2d219 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bool_op/miss ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap index 85ad8a317f..d40859437f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bool_op/miss ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -30,7 +30,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..5, id: Name(""), ctx: Invalid, @@ -43,15 +43,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..12, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..12, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, value: Int( 1, @@ -61,7 +61,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap index e06f081716..c599119ee6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bool_op/name ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -30,7 +30,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("a"), ctx: Load, @@ -43,11 +43,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, id: Name("b"), ctx: Load, @@ -57,17 +57,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..19, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..19, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("x"), ctx: Load, @@ -75,7 +75,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("a"), ctx: Load, @@ -88,11 +88,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("b"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap index 5369e4e69b..a63aa3e177 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/bool_op/star ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -30,11 +30,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..8, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("y"), ctx: Load, @@ -50,17 +50,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..16, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..16, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, id: Name("x"), ctx: Load, @@ -68,11 +68,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..16, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap index a64df1f7b3..419cc7854b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/inva ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..131, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -32,12 +32,12 @@ Module( comparators: [ UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, id: Name("y"), ctx: Load, @@ -52,12 +52,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..41, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("x"), ctx: Store, @@ -66,11 +66,11 @@ Module( ], value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..41, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..38, id: Name(""), ctx: Invalid, @@ -82,7 +82,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("y"), ctx: Load, @@ -95,11 +95,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..121, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..121, id: Name("x"), ctx: Load, @@ -109,16 +109,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..128, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..128, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..128, id: Name("is"), ctx: Load, @@ -130,11 +130,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap index a118b221db..22a228bba8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/inva ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..34, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -32,26 +32,24 @@ Module( comparators: [ Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..20, parameters: Some( Parameters { range: 16..17, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -65,7 +63,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("y"), ctx: Load, @@ -80,15 +78,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..34, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..34, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("x"), ctx: Load, @@ -100,12 +98,12 @@ Module( comparators: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..34, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..34, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap index a38a989312..4ca152d200 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/miss ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, id: Name("y"), ctx: Load, @@ -26,15 +26,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, value: Int( 1, @@ -44,7 +44,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap index b41171207c..b40badc953 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/miss ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -32,7 +32,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..3, id: Name(""), ctx: Invalid, @@ -45,15 +45,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, value: Int( 1, @@ -63,7 +63,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap index e58c0025af..d51319b5b9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/miss ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..71, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, id: Name("x"), ctx: Load, @@ -26,16 +26,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..64, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..64, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..64, id: Name(""), ctx: Invalid, @@ -47,15 +47,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..71, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..71, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, value: Int( 1, @@ -65,7 +65,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap index f02148c958..a9019dc09e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/miss ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -32,7 +32,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..8, id: Name(""), ctx: Invalid, @@ -45,15 +45,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..15, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..15, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, value: Int( 1, @@ -63,7 +63,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap index 023e710c95..38297d62da 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/mult ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..41, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..32, targets: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..29, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, id: Name("x"), ctx: Load, @@ -33,7 +33,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..29, id: Name(""), ctx: Invalid, @@ -45,7 +45,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..32, id: Name("y"), ctx: Load, @@ -55,16 +55,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..40, targets: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..37, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..34, id: Name("x"), ctx: Load, @@ -76,7 +76,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..37, id: Name(""), ctx: Invalid, @@ -88,7 +88,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap index fdeafe1b4d..3bdec1455c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/name ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..31, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -32,7 +32,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, id: Name("y"), ctx: Load, @@ -45,16 +45,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..20, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..20, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, value: Int( 1, @@ -63,7 +63,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, value: Int( 2, @@ -79,15 +79,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..26, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..26, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, id: Name("x"), ctx: Load, @@ -99,7 +99,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, id: Name("y"), ctx: Load, @@ -112,11 +112,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..31, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..31, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap index 90dd6b2056..0de6ae37e0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/compare/star ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..39, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -32,11 +32,11 @@ Module( comparators: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..7, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("y"), ctx: Load, @@ -52,15 +52,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..19, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..19, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("x"), ctx: Load, @@ -72,11 +72,11 @@ Module( comparators: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..19, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("y"), ctx: Load, @@ -92,19 +92,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..27, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..27, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..27, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("x"), ctx: Load, @@ -116,7 +116,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("y"), ctx: Load, @@ -132,19 +132,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..39, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..39, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..39, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("x"), ctx: Load, @@ -156,7 +156,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap index 7a00017491..6c72721b03 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/compreh ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..362, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..34, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..34, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("x"), ctx: Load, @@ -28,7 +28,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, id: Name("y"), ctx: Load, @@ -37,10 +37,10 @@ Module( generators: [ Comprehension { range: 23..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, value: Int( 1, @@ -49,7 +49,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, id: Name("y"), ctx: Load, @@ -65,15 +65,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..54, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..54, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, id: Name("x"), ctx: Load, @@ -81,7 +81,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("y"), ctx: Load, @@ -90,16 +90,16 @@ Module( generators: [ Comprehension { range: 41..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..48, value: StringLiteralValue { inner: Single( StringLiteral { range: 45..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", flags: StringLiteralFlags { quote_style: Single, @@ -113,7 +113,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, id: Name("y"), ctx: Load, @@ -129,15 +129,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..77, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..77, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("x"), ctx: Load, @@ -145,7 +145,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, id: Name("y"), ctx: Load, @@ -154,14 +154,14 @@ Module( generators: [ Comprehension { range: 61..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..71, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..69, id: Name("call"), ctx: Load, @@ -169,7 +169,7 @@ Module( ), arguments: Arguments { range: 69..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -177,7 +177,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, id: Name("y"), ctx: Load, @@ -193,15 +193,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..100, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..100, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, id: Name("x"), ctx: Load, @@ -209,7 +209,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, id: Name("y"), ctx: Load, @@ -218,15 +218,15 @@ Module( generators: [ Comprehension { range: 84..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..94, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, id: Name("a"), ctx: Load, @@ -234,7 +234,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..93, id: Name("b"), ctx: Load, @@ -245,7 +245,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, id: Name("y"), ctx: Load, @@ -261,15 +261,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..135, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..135, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..119, id: Name("x"), ctx: Load, @@ -277,7 +277,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..122, id: Name("y"), ctx: Load, @@ -286,10 +286,10 @@ Module( generators: [ Comprehension { range: 123..134, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("x"), ctx: Store, @@ -297,11 +297,11 @@ Module( ), iter: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..134, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..134, id: Name("y"), ctx: Load, @@ -320,15 +320,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..159, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..159, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..138, id: Name("x"), ctx: Load, @@ -336,7 +336,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..141, id: Name("y"), ctx: Load, @@ -345,10 +345,10 @@ Module( generators: [ Comprehension { range: 142..158, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, id: Name("x"), ctx: Store, @@ -356,12 +356,12 @@ Module( ), iter: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..158, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..158, id: Name("y"), ctx: Load, @@ -380,15 +380,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..188, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..188, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 161..162, id: Name("x"), ctx: Load, @@ -396,7 +396,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..165, id: Name("y"), ctx: Load, @@ -405,10 +405,10 @@ Module( generators: [ Comprehension { range: 166..187, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..171, id: Name("x"), ctx: Store, @@ -416,11 +416,11 @@ Module( ), iter: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..187, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..187, id: Name("y"), ctx: Load, @@ -438,15 +438,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..216, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..216, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..191, id: Name("x"), ctx: Load, @@ -454,7 +454,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..194, id: Name("y"), ctx: Load, @@ -463,10 +463,10 @@ Module( generators: [ Comprehension { range: 195..215, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..200, id: Name("x"), ctx: Store, @@ -474,26 +474,24 @@ Module( ), iter: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..215, parameters: Some( Parameters { range: 211..212, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 211..212, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 211..212, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 211..212, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -507,7 +505,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..215, id: Name("y"), ctx: Load, @@ -525,15 +523,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..257, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..257, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..233, id: Name("x"), ctx: Load, @@ -541,7 +539,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..236, id: Name("y"), ctx: Load, @@ -550,10 +548,10 @@ Module( generators: [ Comprehension { range: 237..256, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..242, id: Name("x"), ctx: Store, @@ -561,7 +559,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..250, id: Name("data"), ctx: Load, @@ -570,11 +568,11 @@ Module( ifs: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..256, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..256, id: Name("y"), ctx: Load, @@ -593,15 +591,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..289, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..289, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..260, id: Name("x"), ctx: Load, @@ -609,7 +607,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 262..263, id: Name("y"), ctx: Load, @@ -618,10 +616,10 @@ Module( generators: [ Comprehension { range: 264..288, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 268..269, id: Name("x"), ctx: Store, @@ -629,7 +627,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 273..277, id: Name("data"), ctx: Load, @@ -638,12 +636,12 @@ Module( ifs: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..288, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 287..288, id: Name("y"), ctx: Load, @@ -662,15 +660,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..326, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..326, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 291..292, id: Name("x"), ctx: Load, @@ -678,7 +676,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 294..295, id: Name("y"), ctx: Load, @@ -687,10 +685,10 @@ Module( generators: [ Comprehension { range: 296..325, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..301, id: Name("x"), ctx: Store, @@ -698,7 +696,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 305..309, id: Name("data"), ctx: Load, @@ -707,11 +705,11 @@ Module( ifs: [ YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..325, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..325, id: Name("y"), ctx: Load, @@ -729,15 +727,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..362, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..362, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 328..329, id: Name("x"), ctx: Load, @@ -745,7 +743,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..332, id: Name("y"), ctx: Load, @@ -754,10 +752,10 @@ Module( generators: [ Comprehension { range: 333..361, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 337..338, id: Name("x"), ctx: Store, @@ -765,7 +763,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 342..346, id: Name("data"), ctx: Load, @@ -774,26 +772,24 @@ Module( ifs: [ Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 350..361, parameters: Some( Parameters { range: 357..358, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 357..358, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 357..358, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 357..358, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -807,7 +803,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 360..361, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap index 2375e262a6..a579afac89 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap @@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/double_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..278, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..135, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..135, items: [ DictItem { key: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, id: Name("x"), ctx: Load, @@ -34,7 +34,7 @@ Module( key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..134, value: Int( 1, @@ -44,7 +44,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..134, id: Name(""), ctx: Invalid, @@ -58,18 +58,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..162, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..162, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..138, id: Name("a"), ctx: Load, @@ -78,7 +78,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..141, value: Int( 1, @@ -90,18 +90,18 @@ Module( key: None, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..161, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..154, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..146, id: Name("x"), ctx: Load, @@ -109,7 +109,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..161, id: Name("y"), ctx: Load, @@ -125,37 +125,35 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..184, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..184, items: [ DictItem { key: None, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..177, parameters: Some( Parameters { range: 173..174, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 173..174, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 173..174, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 173..174, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -169,7 +167,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..177, id: Name("x"), ctx: Load, @@ -182,7 +180,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..180, id: Name("b"), ctx: Load, @@ -191,7 +189,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..183, value: Int( 2, @@ -206,18 +204,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..201, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..201, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..187, id: Name("a"), ctx: Load, @@ -226,7 +224,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, value: Int( 1, @@ -238,13 +236,13 @@ Module( key: None, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..200, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..195, id: Name("x"), ctx: Load, @@ -252,7 +250,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..200, id: Name("y"), ctx: Load, @@ -269,24 +267,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..219, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..219, items: [ DictItem { key: None, value: 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("x"), ctx: Load, @@ -294,7 +292,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..212, id: Name("y"), ctx: Load, @@ -308,7 +306,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..215, id: Name("b"), ctx: Load, @@ -317,7 +315,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..218, value: Int( 2, @@ -332,18 +330,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..241, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..241, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..222, id: Name("a"), ctx: Load, @@ -352,7 +350,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..225, value: Int( 1, @@ -364,12 +362,12 @@ Module( key: None, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 229..234, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..234, id: Name("x"), ctx: Load, @@ -382,7 +380,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..237, id: Name("b"), ctx: Load, @@ -391,7 +389,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..240, value: Int( 2, @@ -406,22 +404,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..252, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..252, items: [ DictItem { key: None, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..251, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..246, id: Name("x"), ctx: Load, @@ -433,7 +431,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..251, id: Name("y"), ctx: Load, @@ -450,22 +448,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..267, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..267, items: [ DictItem { key: None, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 256..266, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 256..257, id: Name("x"), ctx: Load, @@ -477,7 +475,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..266, id: Name("y"), ctx: Load, @@ -494,22 +492,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 268..277, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 268..277, items: [ DictItem { key: None, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..276, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..272, id: Name("x"), ctx: Load, @@ -521,7 +519,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 275..276, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap index 22ca3a3d36..9c0cde63d3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap @@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/double_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..358, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..147, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..147, items: [ DictItem { key: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..126, id: Name("x"), ctx: Load, @@ -34,7 +34,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, id: Name("y"), ctx: Load, @@ -43,7 +43,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..133, id: Name("for"), ctx: Load, @@ -54,7 +54,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..135, id: Name("x"), ctx: Load, @@ -63,7 +63,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..135, id: Name(""), ctx: Invalid, @@ -74,11 +74,11 @@ Module( key: Some( Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..146, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..138, id: Name("y"), ctx: Load, @@ -90,7 +90,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..146, id: Name("data"), ctx: Load, @@ -102,7 +102,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..146, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap index 3b205a80f1..99d310bc87 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap @@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/missing ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, id: Name("x"), ctx: Load, @@ -32,7 +32,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..8, id: Name("def"), ctx: Load, @@ -43,11 +43,11 @@ Module( key: Some( Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..14, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..12, id: Name("foo"), ctx: Load, @@ -55,7 +55,7 @@ Module( ), arguments: Arguments { range: 12..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -64,7 +64,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..24, id: Name("pass"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap index 487654f51d..c53bcf8e92 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap @@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/missing ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, id: Name("x"), ctx: Load, @@ -32,11 +32,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, value: Int( 1, @@ -46,7 +46,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap index 474f5b3038..a5a08be0be 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap @@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/missing ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..27, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, id: Name("x"), ctx: Load, @@ -32,7 +32,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, value: Int( 1, @@ -47,21 +47,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..27, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 12..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 15..17, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -72,7 +70,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..27, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap index a6bcfaa621..5db7a61381 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap @@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/named_e ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..84, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..77, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..77, items: [ DictItem { key: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..62, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("x"), ctx: Store, @@ -35,7 +35,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..62, value: Int( 1, @@ -47,7 +47,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..65, id: Name("y"), ctx: Load, @@ -58,7 +58,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..68, id: Name("z"), ctx: Load, @@ -67,7 +67,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..68, id: Name(""), ctx: Invalid, @@ -78,7 +78,7 @@ Module( key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, value: Int( 2, @@ -88,7 +88,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, id: Name("a"), ctx: Load, @@ -102,15 +102,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..84, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..84, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, id: Name("x"), ctx: Load, @@ -119,7 +119,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap index 47c76d0afc..58509cc935 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap @@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/named_e ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..86, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..79, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..79, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..59, id: Name("x"), ctx: Load, @@ -32,7 +32,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..62, id: Name("y"), ctx: Load, @@ -43,7 +43,7 @@ Module( key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, value: Int( 1, @@ -53,7 +53,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..67, id: Name(""), ctx: Invalid, @@ -64,7 +64,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..70, id: Name("z"), ctx: Load, @@ -73,7 +73,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("a"), ctx: Load, @@ -84,7 +84,7 @@ Module( key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, value: Int( 2, @@ -94,7 +94,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..78, id: Name(""), ctx: Invalid, @@ -108,15 +108,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..86, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..86, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, id: Name("x"), ctx: Load, @@ -125,7 +125,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..86, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap index ecfb8d7b9a..c4c4f242c8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/dict/recover ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..346, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..91, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..91, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..89, id: Name(""), ctx: Invalid, @@ -34,18 +34,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..105, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..105, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..95, value: Int( 1, @@ -55,7 +55,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, value: Int( 2, @@ -67,7 +67,7 @@ Module( key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, value: Int( 3, @@ -77,7 +77,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..104, value: Int( 4, @@ -92,18 +92,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..115, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..115, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, value: Int( 1, @@ -113,7 +113,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..112, value: Int( 2, @@ -128,18 +128,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..144, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..144, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..135, value: Int( 1, @@ -149,7 +149,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..138, value: Int( 2, @@ -161,7 +161,7 @@ Module( key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..140, value: Int( 3, @@ -171,7 +171,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..143, value: Int( 4, @@ -186,18 +186,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..162, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..162, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..159, value: Int( 1, @@ -207,7 +207,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..160, id: Name(""), ctx: Invalid, @@ -221,18 +221,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..205, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..205, items: [ DictItem { key: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..204, id: Name(""), ctx: Invalid, @@ -246,18 +246,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..222, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..222, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..208, id: Name("x"), ctx: Load, @@ -266,7 +266,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 210..211, id: Name("y"), ctx: Load, @@ -277,7 +277,7 @@ Module( key: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..215, id: Name(""), ctx: Invalid, @@ -288,7 +288,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..218, id: Name("a"), ctx: Load, @@ -297,7 +297,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..221, id: Name("b"), ctx: Load, @@ -311,22 +311,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..330, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..330, items: [ DictItem { key: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 311..313, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..313, id: Name("x"), ctx: Load, @@ -338,7 +338,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 315..316, id: Name("y"), ctx: Load, @@ -349,7 +349,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 318..319, id: Name("z"), ctx: Load, @@ -358,7 +358,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..322, id: Name("a"), ctx: Load, @@ -369,11 +369,11 @@ Module( key: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..326, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 325..326, id: Name("b"), ctx: Load, @@ -385,7 +385,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 328..329, id: Name("c"), ctx: Load, @@ -399,18 +399,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..345, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..345, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 332..333, id: Name("x"), ctx: Load, @@ -419,11 +419,11 @@ Module( ), value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..337, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..337, id: Name("y"), ctx: Load, @@ -437,7 +437,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 339..340, id: Name("z"), ctx: Load, @@ -446,11 +446,11 @@ Module( ), value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 342..344, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 343..344, id: Name("a"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap index bf215d18b6..ba444eb959 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/emoji_identi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..64, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("a"), ctx: Store, @@ -26,7 +26,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..5, id: Name(""), ctx: Invalid, @@ -36,12 +36,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..37, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, id: Name("a"), ctx: Store, @@ -50,7 +50,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..37, id: Name(""), ctx: Invalid, @@ -60,16 +60,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, op: UAdd, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..43, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap index d4c139b3cc..20d9f0812e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap @@ -7,7 +7,7 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/emoji_statem ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, body: [], }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap index b480e99948..766ec9bebc 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/if/missing_o ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..88, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..67, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..67, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..62, id: Name("expr"), ctx: Load, @@ -28,7 +28,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, id: Name("x"), ctx: Load, @@ -36,7 +36,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..67, id: Name(""), ctx: Invalid, @@ -48,21 +48,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..88, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 73..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 76..78, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -73,7 +71,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..88, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap index beec6bcb14..20584cc80b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/if/missing_o ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..76, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..69, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..69, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..64, id: Name("expr"), ctx: Load, @@ -28,7 +28,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, id: Name("x"), ctx: Load, @@ -36,7 +36,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..69, id: Name(""), ctx: Invalid, @@ -48,15 +48,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..76, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..76, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, value: Int( 1, @@ -66,7 +66,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap index d3c3293580..38246f5155 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/if/missing_t ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..76, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..55, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..55, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..55, id: Name(""), ctx: Invalid, @@ -28,7 +28,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, id: Name("x"), ctx: Load, @@ -36,7 +36,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..55, id: Name(""), ctx: Invalid, @@ -48,21 +48,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..76, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 61..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 64..66, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -73,7 +71,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..76, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap index 39ddb5266a..9ea573657d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/if/missing_t ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..64, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..57, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..57, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..57, id: Name(""), ctx: Invalid, @@ -28,7 +28,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, id: Name("x"), ctx: Load, @@ -36,7 +36,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..57, id: Name(""), ctx: Invalid, @@ -48,15 +48,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..64, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..64, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, value: Int( 1, @@ -66,7 +66,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap index e62779397c..38a8d3c530 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/if/recover.p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..215, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..43, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..43, test: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..36, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..36, id: Name("expr"), ctx: Load, @@ -35,7 +35,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("x"), ctx: Load, @@ -43,7 +43,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, id: Name("y"), ctx: Load, @@ -55,34 +55,32 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..67, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..67, test: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..60, parameters: Some( Parameters { range: 56..57, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -96,7 +94,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, id: Name("x"), ctx: Load, @@ -106,7 +104,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, id: Name("x"), ctx: Load, @@ -114,7 +112,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, id: Name("y"), ctx: Load, @@ -126,20 +124,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..87, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..87, test: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..80, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, id: Name("x"), ctx: Load, @@ -150,7 +148,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Load, @@ -158,7 +156,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..87, id: Name("y"), ctx: Load, @@ -170,19 +168,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..112, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..112, test: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..105, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, id: Name("x"), ctx: Load, @@ -192,7 +190,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, id: Name("x"), ctx: Load, @@ -200,7 +198,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..112, id: Name("y"), ctx: Load, @@ -212,15 +210,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..164, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..164, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..151, id: Name("expr"), ctx: Load, @@ -228,7 +226,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..143, id: Name("x"), ctx: Load, @@ -236,11 +234,11 @@ Module( ), orelse: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..164, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..164, id: Name("orelse"), ctx: Load, @@ -255,15 +253,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..187, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..187, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..174, id: Name("expr"), ctx: Load, @@ -271,7 +269,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..166, id: Name("x"), ctx: Load, @@ -279,12 +277,12 @@ Module( ), orelse: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 180..187, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..187, id: Name("y"), ctx: Load, @@ -299,15 +297,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..215, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..215, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..197, id: Name("expr"), ctx: Load, @@ -315,7 +313,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..189, id: Name("x"), ctx: Load, @@ -323,11 +321,11 @@ Module( ), orelse: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 203..215, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..215, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap index ac95e6aff7..7d2bfdb631 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap @@ -7,35 +7,33 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/lambda_defau ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, parameters: Some( Parameters { range: 7..17, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -43,21 +41,21 @@ Module( }, ParameterWithDefault { range: 10..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 10..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 10..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..14, value: Int( 20, @@ -68,14 +66,14 @@ Module( }, ParameterWithDefault { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -89,7 +87,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap index 30e3bf68b1..986a07de03 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap @@ -7,35 +7,33 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/lambda_dupli ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..91, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, parameters: Some( Parameters { range: 7..11, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -43,14 +41,14 @@ Module( }, ParameterWithDefault { range: 10..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 10..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 10..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -64,7 +62,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, value: Int( 1, @@ -77,30 +75,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..33, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..33, parameters: Some( Parameters { range: 23..30, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 23..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 23..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 23..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -111,14 +107,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -130,7 +126,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, value: Int( 1, @@ -143,30 +139,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..52, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..52, parameters: Some( Parameters { range: 42..49, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -174,21 +168,21 @@ Module( }, ParameterWithDefault { range: 45..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 45..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 45..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..49, value: Int( 20, @@ -205,7 +199,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 1, @@ -218,30 +212,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..69, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..69, parameters: Some( Parameters { range: 61..66, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 61..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 61..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 61..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -251,11 +243,11 @@ Module( vararg: Some( Parameter { range: 64..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 65..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -266,7 +258,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, value: Int( 1, @@ -279,30 +271,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..90, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..90, parameters: Some( Parameters { range: 78..87, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 78..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 78..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 78..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -314,11 +304,11 @@ Module( kwarg: Some( Parameter { range: 84..87, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 86..87, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -327,7 +317,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap index 110db0cba9..80f0ed10de 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/compreh ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..376, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..48, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..48, elt: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..36, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("x"), ctx: Load, @@ -36,10 +36,10 @@ Module( generators: [ Comprehension { range: 37..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("x"), ctx: Store, @@ -47,7 +47,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, id: Name("y"), ctx: Load, @@ -63,15 +63,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..81, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..81, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Load, @@ -80,10 +80,10 @@ Module( generators: [ Comprehension { range: 70..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, value: Int( 1, @@ -92,7 +92,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, id: Name("y"), ctx: Load, @@ -108,15 +108,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..98, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..98, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, id: Name("x"), ctx: Load, @@ -125,16 +125,16 @@ Module( generators: [ Comprehension { range: 85..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..92, value: StringLiteralValue { inner: Single( StringLiteral { range: 89..92, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", flags: StringLiteralFlags { quote_style: Single, @@ -148,7 +148,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, id: Name("y"), ctx: Load, @@ -164,15 +164,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..118, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..118, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, id: Name("x"), ctx: Load, @@ -181,14 +181,14 @@ Module( generators: [ Comprehension { range: 102..117, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..112, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..110, id: Name("call"), ctx: Load, @@ -196,7 +196,7 @@ Module( ), arguments: Arguments { range: 110..112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -204,7 +204,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..117, id: Name("y"), ctx: Load, @@ -220,15 +220,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..138, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..138, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..121, id: Name("x"), ctx: Load, @@ -237,15 +237,15 @@ Module( generators: [ Comprehension { range: 122..137, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..132, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("a"), ctx: Load, @@ -253,7 +253,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..131, id: Name("b"), ctx: Load, @@ -264,7 +264,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..137, id: Name("y"), ctx: Load, @@ -280,15 +280,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..170, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..170, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..157, id: Name("x"), ctx: Load, @@ -297,10 +297,10 @@ Module( generators: [ Comprehension { range: 158..169, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..163, id: Name("x"), ctx: Store, @@ -308,11 +308,11 @@ Module( ), iter: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..169, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..169, id: Name("y"), ctx: Load, @@ -331,15 +331,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..191, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..191, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..173, id: Name("x"), ctx: Load, @@ -348,10 +348,10 @@ Module( generators: [ Comprehension { range: 174..190, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..179, id: Name("x"), ctx: Store, @@ -359,12 +359,12 @@ Module( ), iter: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..190, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, id: Name("y"), ctx: Load, @@ -383,15 +383,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..217, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..217, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..194, id: Name("x"), ctx: Load, @@ -400,10 +400,10 @@ Module( generators: [ Comprehension { range: 195..216, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..200, id: Name("x"), ctx: Store, @@ -411,11 +411,11 @@ Module( ), iter: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..216, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..216, id: Name("y"), ctx: Load, @@ -433,15 +433,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 218..242, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 218..242, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..220, id: Name("x"), ctx: Load, @@ -450,10 +450,10 @@ Module( generators: [ Comprehension { range: 221..241, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..226, id: Name("x"), ctx: Store, @@ -461,26 +461,24 @@ Module( ), iter: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..241, parameters: Some( Parameters { range: 237..238, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 237..238, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 237..238, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 237..238, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -494,7 +492,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..241, id: Name("y"), ctx: Load, @@ -512,15 +510,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 257..280, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 257..280, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..259, id: Name("x"), ctx: Load, @@ -529,10 +527,10 @@ Module( generators: [ Comprehension { range: 260..279, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..265, id: Name("x"), ctx: Store, @@ -540,7 +538,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..273, id: Name("data"), ctx: Load, @@ -549,11 +547,11 @@ Module( ifs: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 277..279, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 278..279, id: Name("y"), ctx: Load, @@ -572,15 +570,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..309, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..309, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..283, id: Name("x"), ctx: Load, @@ -589,10 +587,10 @@ Module( generators: [ Comprehension { range: 284..308, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 288..289, id: Name("x"), ctx: Store, @@ -600,7 +598,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 293..297, id: Name("data"), ctx: Load, @@ -609,12 +607,12 @@ Module( ifs: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..308, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 307..308, id: Name("y"), ctx: Load, @@ -633,15 +631,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..343, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..343, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 311..312, id: Name("x"), ctx: Load, @@ -650,10 +648,10 @@ Module( generators: [ Comprehension { range: 313..342, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..318, id: Name("x"), ctx: Store, @@ -661,7 +659,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 322..326, id: Name("data"), ctx: Load, @@ -670,11 +668,11 @@ Module( ifs: [ YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 330..342, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 341..342, id: Name("y"), ctx: Load, @@ -692,15 +690,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..376, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..376, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 345..346, id: Name("x"), ctx: Load, @@ -709,10 +707,10 @@ Module( generators: [ Comprehension { range: 347..375, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..352, id: Name("x"), ctx: Store, @@ -720,7 +718,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 356..360, id: Name("data"), ctx: Load, @@ -729,26 +727,24 @@ Module( ifs: [ Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..375, parameters: Some( Parameters { range: 371..372, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 371..372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 371..372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 371..372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -762,7 +758,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 374..375, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap index 04f72aae23..27415fde73 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/missing ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..43, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..43, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap index da496ea1cd..d53b5a8291 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap @@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/missing ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..133, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..133, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..133, elts: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..133, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, id: Name("x"), ctx: Load, @@ -34,7 +34,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap index c65c7f3f8f..3bfaaa689e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/missing ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..141, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..141, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..141, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, value: Int( 1, @@ -30,11 +30,11 @@ Module( ), BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..141, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..137, id: Name("x"), ctx: Load, @@ -43,7 +43,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..141, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap index 833765842b..4f21ca4ddf 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/missing ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..140, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..119, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..119, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..116, value: Int( 1, @@ -30,7 +30,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..119, value: Int( 2, @@ -45,21 +45,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..140, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 125..128, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 128..130, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -70,7 +68,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..140, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap index e3535344a6..3b1ba32aac 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/recover ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..208, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..85, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..85, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..83, id: Name(""), ctx: Invalid, @@ -35,16 +35,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..93, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..93, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, value: Int( 1, @@ -53,7 +53,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..92, value: Int( 2, @@ -68,16 +68,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..100, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..100, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, value: Int( 1, @@ -92,16 +92,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..123, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..123, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, value: Int( 1, @@ -110,7 +110,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..122, value: Int( 2, @@ -125,16 +125,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..162, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..162, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..158, value: Int( 1, @@ -143,7 +143,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..161, value: Int( 2, @@ -158,16 +158,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..194, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..194, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..187, value: Int( 1, @@ -176,11 +176,11 @@ Module( ), BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..192, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, id: Name("x"), ctx: Load, @@ -189,7 +189,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..192, id: Name(""), ctx: Invalid, @@ -205,16 +205,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..202, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..202, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..198, value: Int( 1, @@ -223,7 +223,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..201, value: Int( 2, @@ -238,20 +238,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..207, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..207, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 205..206, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..206, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap index caa6a5a30d..064ab37b92 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap @@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/list/star_ex ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..200, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..93, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..93, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..88, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..88, id: Name("x"), ctx: Load, @@ -36,7 +36,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..92, id: Name("y"), ctx: Load, @@ -50,24 +50,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..106, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..106, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..102, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..102, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, id: Name("x"), ctx: Load, @@ -79,7 +79,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..102, id: Name("y"), ctx: Load, @@ -93,7 +93,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, id: Name("z"), ctx: Load, @@ -107,25 +107,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..118, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..118, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..114, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..114, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..114, id: Name("x"), ctx: Load, @@ -138,7 +138,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..117, id: Name("z"), ctx: Load, @@ -152,26 +152,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..132, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..132, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..128, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..128, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..122, id: Name("x"), ctx: Load, @@ -179,7 +179,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("y"), ctx: Load, @@ -193,7 +193,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..131, id: Name("z"), ctx: Load, @@ -207,26 +207,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..145, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..145, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..141, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..141, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, id: Name("x"), ctx: Load, @@ -234,7 +234,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..141, id: Name("y"), ctx: Load, @@ -248,7 +248,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..144, id: Name("z"), ctx: Load, @@ -262,31 +262,31 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..168, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..168, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..164, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..164, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..157, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..149, id: Name("x"), ctx: Load, @@ -294,7 +294,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..164, id: Name("y"), ctx: Load, @@ -307,7 +307,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..167, id: Name("z"), ctx: Load, @@ -321,39 +321,37 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..186, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..186, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..182, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..182, parameters: Some( Parameters { range: 178..179, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 178..179, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 178..179, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 178..179, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -367,7 +365,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..182, id: Name("x"), ctx: Load, @@ -380,7 +378,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 184..185, id: Name("z"), ctx: Load, @@ -394,24 +392,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..199, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..199, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..195, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..190, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, id: Name("x"), ctx: Store, @@ -422,7 +420,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..195, value: Int( 2, @@ -433,7 +431,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..198, id: Name("z"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap index e19733fe68..80c4345b88 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/invali ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..109, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..68, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..67, target: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..62, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, id: Name("x"), ctx: Load, @@ -33,14 +33,14 @@ Module( attr: Identifier { id: Name("y"), range: 61..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Store, }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, value: Int( 1, @@ -53,19 +53,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..80, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..79, target: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..74, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, id: Name("x"), ctx: Load, @@ -73,7 +73,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("y"), ctx: Load, @@ -84,7 +84,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, value: Int( 1, @@ -97,19 +97,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..90, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..89, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..84, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, id: Name("x"), ctx: Store, @@ -120,7 +120,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, value: Int( 1, @@ -133,20 +133,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..109, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..108, target: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..98, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, id: Name("x"), ctx: Store, @@ -154,7 +154,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, id: Name("y"), ctx: Store, @@ -166,12 +166,12 @@ Module( ), value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..108, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..104, value: Int( 1, @@ -180,7 +180,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..107, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap index 8015e50f6a..d434114a50 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/missin ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..75, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap index af8dfa5210..d37bcfe97a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/missin ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..33, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..33, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..33, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("x"), ctx: Store, @@ -28,7 +28,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..33, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap index aaa227cdfe..884fb234b2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/missin ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..87, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..71, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..71, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("x"), ctx: Store, @@ -28,7 +28,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..71, id: Name("def"), ctx: Load, @@ -40,15 +40,15 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..87, target: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..77, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..75, id: Name("foo"), ctx: Load, @@ -56,7 +56,7 @@ Module( ), arguments: Arguments { range: 75..77, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -64,7 +64,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..87, id: Name("pass"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap index e7e25c0972..181c17c668 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/missin ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..112, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..112, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..112, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..102, id: Name("x"), ctx: Store, @@ -28,11 +28,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..112, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..108, id: Name("x"), ctx: Load, @@ -41,7 +41,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..112, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap index dc699731ce..ee4effd12c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/named/missin ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..78, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..71, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..69, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, id: Name("x"), ctx: Store, @@ -28,7 +28,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..69, id: Name(""), ctx: Invalid, @@ -40,15 +40,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..78, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..78, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..74, id: Name("x"), ctx: Load, @@ -57,7 +57,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap index 3ac0c1bdff..3e8a85dc97 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..36, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, elt: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..3, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, id: Name("x"), ctx: Load, @@ -36,10 +36,10 @@ Module( generators: [ Comprehension { range: 4..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("x"), ctx: Store, @@ -47,7 +47,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("y"), ctx: Load, @@ -64,20 +64,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..24, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..24, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..23, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("x"), ctx: Store, @@ -85,7 +85,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, value: Int( 1, @@ -103,12 +103,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..35, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("x"), ctx: Store, @@ -116,7 +116,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap index 1b1d87fe6d..ed9f13abc6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..47, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..47, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap index 5dee13a8a2..80fe213fc2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..137, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..137, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..137, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, id: Name("x"), ctx: Load, @@ -29,7 +29,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..137, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap index b5721df967..fa0cdaade8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..146, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..146, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..146, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..138, value: Int( 1, @@ -30,11 +30,11 @@ Module( ), BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..146, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..142, id: Name("x"), ctx: Load, @@ -43,7 +43,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..146, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap index bbf1fb9749..b98aae283e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..144, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..123, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..123, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, value: Int( 1, @@ -30,7 +30,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, value: Int( 2, @@ -46,21 +46,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..144, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 129..132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 132..134, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -71,7 +69,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..144, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap index 9012f3e1be..2dc3440241 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..125, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..70, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..69, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Load, @@ -33,11 +33,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, id: Name("x"), ctx: Load, @@ -47,11 +47,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..125, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..125, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap index a44a6fc066..768381c483 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..267, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..86, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..86, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..84, id: Name(""), ctx: Invalid, @@ -36,16 +36,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..94, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..94, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, value: Int( 1, @@ -54,7 +54,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..93, value: Int( 2, @@ -70,16 +70,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..101, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..101, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, value: Int( 1, @@ -95,11 +95,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..121, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..121, value: Int( 1, @@ -110,11 +110,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, value: Int( 2, @@ -125,11 +125,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..162, target: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..159, value: Int( 1, @@ -138,7 +138,7 @@ Module( ), annotation: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 161..162, value: Int( 2, @@ -151,16 +151,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..195, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..195, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..188, value: Int( 1, @@ -169,11 +169,11 @@ Module( ), BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..193, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..191, id: Name("x"), ctx: Load, @@ -182,7 +182,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..193, id: Name(""), ctx: Invalid, @@ -199,11 +199,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..199, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 198..199, value: Int( 1, @@ -214,11 +214,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..202, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..202, value: Int( 2, @@ -229,16 +229,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..267, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..267, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..256, id: Name("x"), ctx: Load, @@ -246,7 +246,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..259, id: Name("y"), ctx: Load, @@ -254,7 +254,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 263..264, value: Int( 2, @@ -263,7 +263,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 266..267, id: Name("z"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap index b566c6a594..da92fa1991 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap @@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/parenthesize ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..532, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..178, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..178, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..165, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..165, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..160, id: Name("x"), ctx: Load, @@ -41,7 +41,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..165, id: Name("y"), ctx: Load, @@ -55,7 +55,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..168, id: Name("z"), ctx: Load, @@ -63,15 +63,15 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..177, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..177, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..172, id: Name("x"), ctx: Load, @@ -83,7 +83,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..177, id: Name("y"), ctx: Load, @@ -104,25 +104,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..198, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..198, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 180..186, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..186, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..186, id: Name("x"), ctx: Load, @@ -135,7 +135,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..189, id: Name("z"), ctx: Load, @@ -143,16 +143,16 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..197, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..197, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..197, id: Name("x"), ctx: Load, @@ -172,26 +172,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..222, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..222, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..208, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..208, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..202, id: Name("x"), ctx: Load, @@ -199,7 +199,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..208, id: Name("y"), ctx: Load, @@ -213,7 +213,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 210..211, id: Name("z"), ctx: Load, @@ -221,17 +221,17 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..221, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..221, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..215, id: Name("x"), ctx: Load, @@ -239,7 +239,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..221, id: Name("y"), ctx: Load, @@ -260,26 +260,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..244, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..244, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..231, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..231, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..226, id: Name("x"), ctx: Load, @@ -287,7 +287,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..231, id: Name("y"), ctx: Load, @@ -301,7 +301,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..234, id: Name("z"), ctx: Load, @@ -309,17 +309,17 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..243, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 237..243, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 237..238, id: Name("x"), ctx: Load, @@ -327,7 +327,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..243, id: Name("y"), ctx: Load, @@ -348,31 +348,31 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..286, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..286, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..263, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 247..263, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 252..256, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 247..248, id: Name("x"), ctx: Load, @@ -380,7 +380,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 262..263, id: Name("y"), ctx: Load, @@ -393,7 +393,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..266, id: Name("z"), ctx: Load, @@ -401,22 +401,22 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 268..285, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..285, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..278, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..270, id: Name("x"), ctx: Load, @@ -424,7 +424,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 284..285, id: Name("y"), ctx: Load, @@ -444,39 +444,37 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 287..318, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 287..318, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 288..300, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 289..300, parameters: Some( Parameters { range: 296..297, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 296..297, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 296..297, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 296..297, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -490,7 +488,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 299..300, id: Name("x"), ctx: Load, @@ -503,7 +501,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 302..303, id: Name("z"), ctx: Load, @@ -511,30 +509,28 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 305..317, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..317, parameters: Some( Parameters { range: 313..314, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 313..314, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 313..314, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 313..314, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -548,7 +544,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 316..317, id: Name("x"), ctx: Load, @@ -568,24 +564,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..340, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..340, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 320..327, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 320..322, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..322, id: Name("x"), ctx: Store, @@ -596,7 +592,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 326..327, value: Int( 2, @@ -607,7 +603,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 329..330, id: Name("z"), ctx: Load, @@ -615,15 +611,15 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 332..339, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 332..334, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 333..334, id: Name("x"), ctx: Store, @@ -634,7 +630,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 338..339, value: Int( 2, @@ -652,24 +648,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 363..382, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 363..382, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 363..370, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..370, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..365, id: Name("x"), ctx: Load, @@ -681,7 +677,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 369..370, id: Name("y"), ctx: Load, @@ -695,7 +691,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 372..373, id: Name("z"), ctx: Load, @@ -703,15 +699,15 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 375..382, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 376..382, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 376..377, id: Name("x"), ctx: Load, @@ -723,7 +719,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 381..382, id: Name("y"), ctx: Load, @@ -744,25 +740,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..400, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..400, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..389, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 384..389, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 388..389, id: Name("x"), ctx: Load, @@ -775,7 +771,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 391..392, id: Name("z"), ctx: Load, @@ -783,16 +779,16 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 394..400, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 395..400, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 399..400, id: Name("x"), ctx: Load, @@ -812,26 +808,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 401..422, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 401..422, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 401..409, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 402..409, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 402..403, id: Name("x"), ctx: Load, @@ -839,7 +835,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 408..409, id: Name("y"), ctx: Load, @@ -853,7 +849,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 411..412, id: Name("z"), ctx: Load, @@ -861,17 +857,17 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 414..422, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 415..422, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 415..416, id: Name("x"), ctx: Load, @@ -879,7 +875,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..422, id: Name("y"), ctx: Load, @@ -900,26 +896,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 423..442, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 423..442, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 423..430, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 424..430, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 424..425, id: Name("x"), ctx: Load, @@ -927,7 +923,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 429..430, id: Name("y"), ctx: Load, @@ -941,7 +937,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 432..433, id: Name("z"), ctx: Load, @@ -949,17 +945,17 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 435..442, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 436..442, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 436..437, id: Name("x"), ctx: Load, @@ -967,7 +963,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 441..442, id: Name("y"), ctx: Load, @@ -988,31 +984,31 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 443..482, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 443..482, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 443..460, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 444..460, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 449..453, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 444..445, id: Name("x"), ctx: Load, @@ -1020,7 +1016,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 459..460, id: Name("y"), ctx: Load, @@ -1033,7 +1029,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 462..463, id: Name("z"), ctx: Load, @@ -1041,22 +1037,22 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 465..482, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 466..482, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 471..475, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 466..467, id: Name("x"), ctx: Load, @@ -1064,7 +1060,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 481..482, id: Name("y"), ctx: Load, @@ -1084,39 +1080,37 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 483..512, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 483..512, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 483..495, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 484..495, parameters: Some( Parameters { range: 491..492, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 491..492, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 491..492, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 491..492, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1130,7 +1124,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 494..495, id: Name("x"), ctx: Load, @@ -1143,7 +1137,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 497..498, id: Name("z"), ctx: Load, @@ -1151,30 +1145,28 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 500..512, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 501..512, parameters: Some( Parameters { range: 508..509, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 508..509, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 508..509, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 508..509, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1188,7 +1180,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 511..512, id: Name("x"), ctx: Load, @@ -1208,15 +1200,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 513..515, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 513..515, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 514..515, id: Name("x"), ctx: Load, @@ -1229,16 +1221,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 519..532, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 519..532, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 519..520, value: Int( 2, @@ -1247,7 +1239,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 522..523, id: Name("z"), ctx: Load, @@ -1255,11 +1247,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 525..527, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 526..527, id: Name("x"), ctx: Load, @@ -1270,7 +1262,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 531..532, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap index abf42e4b03..08cad0598c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/comprehe ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..377, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..48, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..48, elt: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..36, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("x"), ctx: Load, @@ -36,10 +36,10 @@ Module( generators: [ Comprehension { range: 37..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("x"), ctx: Store, @@ -47,7 +47,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, id: Name("y"), ctx: Load, @@ -63,15 +63,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..81, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..81, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Load, @@ -80,10 +80,10 @@ Module( generators: [ Comprehension { range: 70..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, value: Int( 1, @@ -92,7 +92,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, id: Name("y"), ctx: Load, @@ -108,15 +108,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..98, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..98, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, id: Name("x"), ctx: Load, @@ -125,16 +125,16 @@ Module( generators: [ Comprehension { range: 85..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..92, value: StringLiteralValue { inner: Single( StringLiteral { range: 89..92, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", flags: StringLiteralFlags { quote_style: Single, @@ -148,7 +148,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, id: Name("y"), ctx: Load, @@ -164,15 +164,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..118, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..118, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, id: Name("x"), ctx: Load, @@ -181,14 +181,14 @@ Module( generators: [ Comprehension { range: 102..117, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..112, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..110, id: Name("call"), ctx: Load, @@ -196,7 +196,7 @@ Module( ), arguments: Arguments { range: 110..112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -204,7 +204,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..117, id: Name("y"), ctx: Load, @@ -220,15 +220,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..138, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..138, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..121, id: Name("x"), ctx: Load, @@ -237,15 +237,15 @@ Module( generators: [ Comprehension { range: 122..137, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..132, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("a"), ctx: Load, @@ -253,7 +253,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..131, id: Name("b"), ctx: Load, @@ -264,7 +264,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..137, id: Name("y"), ctx: Load, @@ -280,15 +280,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..170, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..170, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..157, id: Name("x"), ctx: Load, @@ -297,10 +297,10 @@ Module( generators: [ Comprehension { range: 158..169, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..163, id: Name("x"), ctx: Store, @@ -308,11 +308,11 @@ Module( ), iter: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..169, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..169, id: Name("y"), ctx: Load, @@ -331,15 +331,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..191, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..191, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..173, id: Name("x"), ctx: Load, @@ -348,10 +348,10 @@ Module( generators: [ Comprehension { range: 174..190, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..179, id: Name("x"), ctx: Store, @@ -359,12 +359,12 @@ Module( ), iter: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..190, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, id: Name("y"), ctx: Load, @@ -383,15 +383,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..217, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..217, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..194, id: Name("x"), ctx: Load, @@ -400,10 +400,10 @@ Module( generators: [ Comprehension { range: 195..216, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..200, id: Name("x"), ctx: Store, @@ -411,11 +411,11 @@ Module( ), iter: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..216, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..216, id: Name("y"), ctx: Load, @@ -433,15 +433,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 218..242, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 218..242, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..220, id: Name("x"), ctx: Load, @@ -450,10 +450,10 @@ Module( generators: [ Comprehension { range: 221..241, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..226, id: Name("x"), ctx: Store, @@ -461,26 +461,24 @@ Module( ), iter: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..241, parameters: Some( Parameters { range: 237..238, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 237..238, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 237..238, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 237..238, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -494,7 +492,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..241, id: Name("y"), ctx: Load, @@ -512,15 +510,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 257..280, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 257..280, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..259, id: Name("x"), ctx: Load, @@ -529,10 +527,10 @@ Module( generators: [ Comprehension { range: 260..279, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..265, id: Name("x"), ctx: Store, @@ -540,7 +538,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..273, id: Name("data"), ctx: Load, @@ -549,11 +547,11 @@ Module( ifs: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 277..279, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 278..279, id: Name("y"), ctx: Load, @@ -572,15 +570,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..309, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..309, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..283, id: Name("x"), ctx: Load, @@ -589,10 +587,10 @@ Module( generators: [ Comprehension { range: 284..308, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 288..289, id: Name("x"), ctx: Store, @@ -600,7 +598,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 293..297, id: Name("data"), ctx: Load, @@ -609,12 +607,12 @@ Module( ifs: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..308, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 307..308, id: Name("y"), ctx: Load, @@ -633,15 +631,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..343, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..343, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 311..312, id: Name("x"), ctx: Load, @@ -650,10 +648,10 @@ Module( generators: [ Comprehension { range: 313..342, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..318, id: Name("x"), ctx: Store, @@ -661,7 +659,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 322..326, id: Name("data"), ctx: Load, @@ -670,11 +668,11 @@ Module( ifs: [ YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 330..342, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 341..342, id: Name("y"), ctx: Load, @@ -692,15 +690,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..376, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..376, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 345..346, id: Name("x"), ctx: Load, @@ -709,10 +707,10 @@ Module( generators: [ Comprehension { range: 347..375, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..352, id: Name("x"), ctx: Store, @@ -720,7 +718,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 356..360, id: Name("data"), ctx: Load, @@ -729,26 +727,24 @@ Module( ifs: [ Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..375, parameters: Some( Parameters { range: 371..372, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 371..372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 371..372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 371..372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -762,7 +758,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 374..375, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap index 43438af0b7..759f2c99c0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/missing_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..47, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..47, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap index b1a51ec0e1..01bfdf4692 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap @@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/missing_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..136, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..136, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..136, elts: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..136, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..132, id: Name("x"), ctx: Load, @@ -34,7 +34,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap index ee7e0553f3..ead70d568e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/missing_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..144, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..144, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..144, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, value: Int( 1, @@ -30,11 +30,11 @@ Module( ), BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..144, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..140, id: Name("x"), ctx: Load, @@ -43,7 +43,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..144, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap index dd12017d4f..311eaae530 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/missing_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..144, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..123, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..123, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, value: Int( 1, @@ -30,7 +30,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, value: Int( 2, @@ -44,21 +44,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..144, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 129..132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 132..134, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -69,7 +67,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..144, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap index fd02629ffd..b489b1c64f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/recover. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..323, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..200, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..200, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 198..198, id: Name(""), ctx: Invalid, @@ -34,16 +34,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..208, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..208, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 203..204, value: Int( 1, @@ -52,7 +52,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..207, value: Int( 2, @@ -66,16 +66,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 210..215, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 210..215, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..212, value: Int( 1, @@ -89,16 +89,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..238, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..238, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..235, value: Int( 1, @@ -107,7 +107,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..237, value: Int( 2, @@ -121,18 +121,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..277, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..277, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 272..273, value: Int( 1, @@ -142,7 +142,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 275..276, value: Int( 2, @@ -157,16 +157,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..309, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..309, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..302, value: Int( 1, @@ -175,11 +175,11 @@ Module( ), BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 304..307, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 304..305, id: Name("x"), ctx: Load, @@ -188,7 +188,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 307..307, id: Name(""), ctx: Invalid, @@ -203,16 +203,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 311..317, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 311..317, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..313, value: Int( 1, @@ -221,7 +221,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 315..316, value: Int( 2, @@ -235,20 +235,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..322, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..322, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 320..321, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..321, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap index 18fb551839..d3c23a0ec3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap @@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/set/star_exp ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..198, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..92, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..92, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..87, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..87, id: Name("x"), ctx: Load, @@ -36,7 +36,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("y"), ctx: Load, @@ -49,24 +49,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..105, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..105, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..101, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..101, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..96, id: Name("x"), ctx: Load, @@ -78,7 +78,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, id: Name("y"), ctx: Load, @@ -92,7 +92,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..104, id: Name("z"), ctx: Load, @@ -105,25 +105,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..117, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..117, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..113, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..113, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..113, id: Name("x"), ctx: Load, @@ -136,7 +136,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..116, id: Name("z"), ctx: Load, @@ -149,26 +149,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..131, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..131, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..127, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..127, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..121, id: Name("x"), ctx: Load, @@ -176,7 +176,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..127, id: Name("y"), ctx: Load, @@ -190,7 +190,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, id: Name("z"), ctx: Load, @@ -203,26 +203,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..144, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..144, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..140, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..140, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..135, id: Name("x"), ctx: Load, @@ -230,7 +230,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..140, id: Name("y"), ctx: Load, @@ -244,7 +244,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..143, id: Name("z"), ctx: Load, @@ -257,31 +257,31 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..167, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..167, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..163, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..163, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..156, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..148, id: Name("x"), ctx: Load, @@ -289,7 +289,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..163, id: Name("y"), ctx: Load, @@ -302,7 +302,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..166, id: Name("z"), ctx: Load, @@ -315,39 +315,37 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..185, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..185, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..181, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..181, parameters: Some( Parameters { range: 177..178, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 177..178, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 177..178, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 177..178, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -361,7 +359,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 180..181, id: Name("x"), ctx: Load, @@ -374,7 +372,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..184, id: Name("z"), ctx: Load, @@ -387,24 +385,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..198, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..198, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..194, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..189, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..189, id: Name("x"), ctx: Store, @@ -415,7 +413,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..194, value: Int( 2, @@ -426,7 +424,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..197, id: Name("z"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap index 133fc59208..2e4321abd9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/subscript/in ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..133, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -28,16 +28,16 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..9, lower: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..8, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, id: Name("x"), ctx: Store, @@ -45,7 +45,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, value: Int( 1, @@ -66,15 +66,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..39, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..39, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..34, id: Name("x"), ctx: Load, @@ -82,16 +82,16 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..38, lower: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..37, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, id: Name("x"), ctx: Load, @@ -112,15 +112,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..46, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..46, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("x"), ctx: Load, @@ -128,17 +128,17 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..45, lower: None, upper: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..45, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, id: Name("x"), ctx: Load, @@ -158,15 +158,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..54, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..54, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Load, @@ -174,18 +174,18 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..53, lower: None, upper: None, step: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..53, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, id: Name("x"), ctx: Load, @@ -204,15 +204,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..73, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..73, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, id: Name("x"), ctx: Load, @@ -220,7 +220,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name(""), ctx: Invalid, @@ -233,15 +233,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..133, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..133, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..124, id: Name("x"), ctx: Load, @@ -249,15 +249,15 @@ Module( ), slice: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..132, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..127, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..127, id: Name("x"), ctx: Store, @@ -268,7 +268,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..132, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap index 734e357a4a..b8b02d2973 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/subscript/un ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -28,17 +28,17 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..10, lower: None, upper: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Load, @@ -47,7 +47,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap index 0d95577060..d3e57ddfc0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/subscript/un ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..25, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Load, @@ -28,14 +28,14 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..9, lower: None, upper: None, step: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..9, id: Name("def"), ctx: Load, @@ -51,15 +51,15 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..25, target: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..15, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..13, id: Name("foo"), ctx: Load, @@ -67,7 +67,7 @@ Module( ), arguments: Arguments { range: 13..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -75,7 +75,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..25, id: Name("pass"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap index f024ef0b37..b8f917a7dd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/unary.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Load, @@ -33,11 +33,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap index 952700a605..45a740ba23 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/unary/named_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..2, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..2, op: USub, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, id: Name("x"), ctx: Load, @@ -33,11 +33,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, value: Int( 1, @@ -48,16 +48,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..13, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..13, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..13, id: Name("x"), ctx: Load, @@ -69,11 +69,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap index 90fbf1bd9f..b11ca386f9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/unary/no_exp ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..3, id: Name(""), ctx: Invalid, @@ -33,15 +33,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Load, @@ -50,7 +50,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap index 2b9353fc3b..48f2e1e00f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/unary/no_exp ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, op: UAdd, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..1, id: Name(""), ctx: Invalid, @@ -33,15 +33,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..8, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..8, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("x"), ctx: Load, @@ -50,7 +50,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap index 73536890ec..5feebcc55f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/yield/named_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..85, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..59, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..59, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..59, id: Name("x"), ctx: Load, @@ -34,11 +34,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, value: Int( 1, @@ -49,21 +49,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..84, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..84, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..84, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, value: Int( 1, @@ -72,7 +72,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, id: Name("x"), ctx: Load, @@ -80,7 +80,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..81, value: Int( 2, @@ -89,7 +89,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, value: Int( 3, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap index 6bd430e889..4238df7e8c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap @@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/yield/star_e ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..67, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..47, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..47, value: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..46, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..46, id: Name("x"), ctx: Load, @@ -41,31 +41,31 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..66, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..66, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..66, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..63, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..63, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("x"), ctx: Load, @@ -73,7 +73,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("y"), ctx: Load, @@ -87,7 +87,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, id: Name("z"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap index 72433f9e77..719d563ed2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/yield_from/s ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..100, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..83, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..83, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..83, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, id: Name("x"), ctx: Load, @@ -39,24 +39,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..100, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..100, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..100, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..97, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, id: Name("x"), ctx: Load, @@ -67,7 +67,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap index a14264ccfb..d521191aa7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/expressions/yield_from/u ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..192, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..47, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..47, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, id: Name("x"), ctx: Load, @@ -32,11 +32,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 1, @@ -47,20 +47,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..104, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..104, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..104, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, id: Name("x"), ctx: Load, @@ -68,7 +68,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..104, id: Name("y"), ctx: Load, @@ -85,20 +85,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..192, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..192, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..192, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 180..181, id: Name("x"), ctx: Load, @@ -106,17 +106,17 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..191, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 184..191, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 184..185, id: Name("x"), ctx: Load, @@ -124,7 +124,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..191, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap index ac3df95658..0deb7be86a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap @@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_conversion_f ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..30, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: FStringValue { inner: Single( FString( FString { range: 0..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("x"), ctx: Load, @@ -58,25 +58,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..19, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..19, value: TStringValue { inner: Single( TString { range: 10..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 12..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("x"), ctx: Load, @@ -102,26 +102,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..29, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..29, value: FStringValue { inner: Single( FString( FString { range: 20..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 22..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap index 42acb3033d..b336a9531b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap @@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_empty_expres ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, value: FStringValue { inner: Single( FString( FString { range: 0..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..4, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..3, id: Name(""), ctx: Invalid, @@ -58,26 +58,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, value: FStringValue { inner: Single( FString( FString { range: 6..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 8..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..9, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap index 0858ce958d..acb9c88e02 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap @@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_invalid_conv ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: FStringValue { inner: Single( FString( FString { range: 0..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap index 165a659e99..28624a678e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap @@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_invalid_conv ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: FStringValue { inner: Single( FString( FString { range: 0..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("x"), ctx: Load, @@ -58,26 +58,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..21, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..21, value: FStringValue { inner: Single( FString( FString { range: 11..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 13..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap index acdb317e91..a6920bde70 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap @@ -7,35 +7,35 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_invalid_star ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..112, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..83, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..83, value: FStringValue { inner: Single( FString( FString { range: 77..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 79..82, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..81, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..81, id: Name(""), ctx: Invalid, @@ -65,36 +65,36 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..97, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..97, value: FStringValue { inner: Single( FString( FString { range: 84..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 86..96, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..95, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..95, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, id: Name("x"), ctx: Load, @@ -102,7 +102,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..95, id: Name("y"), ctx: Load, @@ -135,35 +135,35 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..111, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..111, value: FStringValue { inner: Single( FString( FString { range: 98..111, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 100..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..109, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..109, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap index 3610b8d114..2c4c6ee355 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap @@ -7,50 +7,48 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_lambda_witho ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, value: FStringValue { inner: Single( FString( FString { range: 0..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..12, parameters: Some( Parameters { range: 10..11, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 10..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 10..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 10..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -64,7 +62,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..12, id: Name(""), ctx: Invalid, @@ -80,7 +78,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 12..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " x", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap index 62c1efddfb..9f85f5551d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap @@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_unclosed_lbr ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, value: FStringValue { inner: Single( FString( FString { range: 0..4, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2..3, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..3, id: Name(""), ctx: Invalid, @@ -58,26 +58,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..14, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..14, value: FStringValue { inner: Single( FString( FString { range: 5..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 7..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..11, id: Name("foo"), ctx: Load, @@ -104,26 +104,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..23, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..23, value: FStringValue { inner: Single( FString( FString { range: 15..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 17..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..21, id: Name("foo"), ctx: Load, @@ -155,11 +155,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..37, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..37, value: FStringValue { inner: Concatenated( @@ -167,15 +167,15 @@ Module( FString( FString { range: 24..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 26..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..27, id: Name(""), ctx: Invalid, @@ -197,15 +197,15 @@ Module( FString( FString { range: 29..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..34, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap index 9d97896c80..796a9745ea 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap @@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/err/f_string_unclosed_lbr ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..29, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: FStringValue { inner: Single( FString( FString { range: 0..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 2..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello ", }, ), Interpolation( InterpolatedElement { range: 8..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, id: Name("x"), ctx: Load, @@ -49,7 +49,7 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 11..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], }, ), @@ -71,33 +71,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..28, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..28, value: FStringValue { inner: Single( FString( FString { range: 13..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 15..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello ", }, ), Interpolation( InterpolatedElement { range: 21..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("x"), ctx: Load, @@ -108,12 +108,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 24..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 24..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap index cf2cb1c90b..36e244899b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_iter_unpack_py38. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..106, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..63, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Store, @@ -25,16 +25,16 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..58, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..54, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, id: Name("a"), ctx: Load, @@ -45,7 +45,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, id: Name("b"), ctx: Load, @@ -59,11 +59,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, }, ), @@ -75,12 +75,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..84, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Store, @@ -88,12 +88,12 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..79, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, id: Name("a"), ctx: Load, @@ -101,11 +101,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..79, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, id: Name("b"), ctx: Load, @@ -122,11 +122,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, }, ), @@ -138,12 +138,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..105, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, id: Name("x"), ctx: Store, @@ -151,16 +151,16 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..100, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..96, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..96, id: Name("a"), ctx: Load, @@ -171,11 +171,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..100, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, id: Name("b"), ctx: Load, @@ -192,11 +192,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..105, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..105, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap index 2520538fcc..907c07e8ce 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_invalid_iter ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..71, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Store, @@ -25,17 +25,17 @@ Module( ), iter: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..17, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..17, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("a"), ctx: Load, @@ -43,7 +43,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("b"), ctx: Load, @@ -58,11 +58,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, }, ), @@ -74,12 +74,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..44, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("x"), ctx: Store, @@ -87,12 +87,12 @@ Module( ), iter: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..39, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("a"), ctx: Load, @@ -104,11 +104,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..44, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..44, }, ), @@ -120,12 +120,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..60, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..55, id: Name("target"), ctx: Store, @@ -133,7 +133,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, id: Name("x"), ctx: Load, @@ -145,11 +145,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..70, target: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..65, value: Int( 1, @@ -158,7 +158,7 @@ Module( ), annotation: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..70, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap index 491fd41a42..2ee9ae9293 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_invalid_targ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..154, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, is_async: false, target: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, value: Int( 1, @@ -26,7 +26,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, id: Name("x"), ctx: Load, @@ -35,11 +35,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, }, ), @@ -51,18 +51,18 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..33, is_async: false, target: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, value: StringLiteralValue { inner: Single( StringLiteral { range: 20..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", flags: StringLiteralFlags { quote_style: Double, @@ -76,7 +76,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("x"), ctx: Load, @@ -85,11 +85,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..33, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..33, }, ), @@ -101,22 +101,22 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..56, is_async: false, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..46, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..46, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("x"), ctx: Load, @@ -124,7 +124,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..46, id: Name("y"), ctx: Load, @@ -138,7 +138,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..51, id: Name("z"), ctx: Load, @@ -147,11 +147,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, }, ), @@ -163,20 +163,20 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..77, is_async: false, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..67, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..67, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("x"), ctx: Load, @@ -185,7 +185,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, id: Name("y"), ctx: Load, @@ -198,7 +198,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, id: Name("z"), ctx: Load, @@ -207,11 +207,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..77, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..77, }, ), @@ -223,16 +223,16 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..99, is_async: false, target: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..89, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, id: Name("x"), ctx: Load, @@ -242,7 +242,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, id: Name("z"), ctx: Load, @@ -251,11 +251,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, }, ), @@ -267,21 +267,21 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..121, is_async: false, target: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..116, value: Some( Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..116, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..111, id: Name("x"), ctx: Load, @@ -293,7 +293,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..116, id: Name("y"), ctx: Load, @@ -307,7 +307,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..116, id: Name(""), ctx: Invalid, @@ -316,11 +316,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..121, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..121, }, ), @@ -332,17 +332,17 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..153, is_async: false, target: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..143, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("x"), ctx: Store, @@ -350,7 +350,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..131, value: Int( 1, @@ -359,7 +359,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..134, id: Name("y"), ctx: Store, @@ -367,22 +367,22 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..142, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..142, elts: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 138..141, value: StringLiteralValue { inner: Single( StringLiteral { range: 138..141, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", flags: StringLiteralFlags { quote_style: Double, @@ -407,7 +407,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..148, id: Name("z"), ctx: Load, @@ -416,11 +416,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..153, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..153, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap index cb545e9b38..72cac3d156 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_invalid_targ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..124, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, is_async: false, target: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..14, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Load, @@ -33,7 +33,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("y"), ctx: Load, @@ -44,7 +44,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("z"), ctx: Load, @@ -53,11 +53,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, }, ), @@ -69,16 +69,16 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..45, is_async: false, target: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..35, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("x"), ctx: Load, @@ -90,7 +90,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("y"), ctx: Load, @@ -101,7 +101,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("z"), ctx: Load, @@ -110,11 +110,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..45, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..45, }, ), @@ -126,18 +126,18 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..66, is_async: false, target: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..56, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..51, id: Name("x"), ctx: Load, @@ -145,7 +145,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, id: Name("y"), ctx: Load, @@ -156,7 +156,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("z"), ctx: Load, @@ -165,11 +165,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..66, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..66, }, ), @@ -181,17 +181,17 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..83, is_async: false, target: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..73, op: USub, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("x"), ctx: Store, @@ -201,7 +201,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("y"), ctx: Load, @@ -210,11 +210,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..83, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..83, }, ), @@ -226,17 +226,17 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..103, is_async: false, target: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..93, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..93, id: Name("x"), ctx: Store, @@ -246,7 +246,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, id: Name("y"), ctx: Load, @@ -255,11 +255,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..103, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..103, }, ), @@ -271,16 +271,16 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..123, is_async: false, target: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..113, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, id: Name("x"), ctx: Load, @@ -289,7 +289,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..113, id: Name("y"), ctx: Load, @@ -299,7 +299,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..118, id: Name("z"), ctx: Load, @@ -308,11 +308,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..123, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..123, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap index 185ab4b7a7..d219ca921c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_invalid_targ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..170, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, is_async: false, target: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..13, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("d"), ctx: Load, @@ -29,15 +29,15 @@ Module( ), arguments: Arguments { range: 5..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..12, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -49,7 +49,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, id: Name("y"), ctx: Load, @@ -65,7 +65,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..23, id: Name("target"), ctx: Load, @@ -74,11 +74,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, }, ), @@ -90,20 +90,20 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..56, is_async: false, target: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..43, func: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..40, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("x"), ctx: Load, @@ -115,7 +115,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("y"), ctx: Load, @@ -126,7 +126,7 @@ Module( ), arguments: Arguments { range: 41..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -134,7 +134,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..51, id: Name("iter"), ctx: Load, @@ -143,11 +143,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, }, ), @@ -159,16 +159,16 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..82, is_async: false, target: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..68, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("x"), ctx: Load, @@ -180,7 +180,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..68, id: Name("y"), ctx: Load, @@ -191,7 +191,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..77, id: Name("iter"), ctx: Load, @@ -200,11 +200,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..82, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..82, }, ), @@ -216,21 +216,21 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..111, is_async: false, target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..98, elts: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..94, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, id: Name("x"), ctx: Load, @@ -242,7 +242,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, id: Name("y"), ctx: Load, @@ -253,7 +253,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, id: Name("z"), ctx: Store, @@ -266,7 +266,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..106, id: Name("iter"), ctx: Load, @@ -275,11 +275,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..111, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..111, }, ), @@ -291,21 +291,21 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..140, is_async: false, target: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..127, elts: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..123, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..118, id: Name("x"), ctx: Load, @@ -317,7 +317,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, id: Name("y"), ctx: Load, @@ -328,7 +328,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..126, id: Name("z"), ctx: Store, @@ -340,7 +340,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..135, id: Name("iter"), ctx: Load, @@ -349,11 +349,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..140, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..140, }, ), @@ -365,21 +365,21 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..169, is_async: false, target: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..156, elts: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..152, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, id: Name("x"), ctx: Load, @@ -391,7 +391,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..152, id: Name("y"), ctx: Load, @@ -402,7 +402,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..155, id: Name("z"), ctx: Load, @@ -413,7 +413,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..164, id: Name("iter"), ctx: Load, @@ -422,11 +422,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..169, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..169, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap index d16e1ec4bc..8052c314b5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_missing_in_k ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("a"), ctx: Store, @@ -25,7 +25,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("b"), ctx: Load, @@ -34,11 +34,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..12, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..12, }, ), @@ -50,12 +50,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..23, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("a"), ctx: Store, @@ -63,7 +63,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..18, id: Name(""), ctx: Invalid, @@ -72,11 +72,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap index d258342309..f9640e450a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_missing_iter ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Store, @@ -25,7 +25,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..8, id: Name(""), ctx: Invalid, @@ -34,12 +34,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..19, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("a"), ctx: Store, @@ -48,7 +48,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap index 42ea10ed9f..84d8b4f8cd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/for_stmt_missing_targ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..6, id: Name("in"), ctx: Store, @@ -25,7 +25,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("x"), ctx: Load, @@ -34,11 +34,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..13, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..13, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap index 2c98db482e..2520cfbe49 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap @@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_dotted_na ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..67, body: [ ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, module: Some( Identifier { id: Name("x"), range: 5..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -38,33 +38,33 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..34, module: Some( Identifier { id: Name("x"), range: 22..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 31..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 31..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -74,83 +74,83 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..66, module: Some( Identifier { id: Name("x"), range: 40..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 49..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 49..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 57..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 57..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 62..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("f"), range: 62..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 65..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("g"), range: 65..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap index b84eb9a41a..6534394ab2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap @@ -7,18 +7,18 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_empty_nam ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..48, body: [ ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, module: Some( Identifier { id: Name("x"), range: 5..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [], @@ -27,13 +27,13 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..30, module: Some( Identifier { id: Name("x"), range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [], @@ -42,13 +42,13 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..47, module: Some( Identifier { id: Name("x"), range: 36..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [], diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap index 9e3cbe4994..7f405b3edf 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap @@ -7,12 +7,12 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_missing_m ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, body: [ ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, module: None, names: [], @@ -21,17 +21,17 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..18, module: None, names: [ Alias { range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap index 761cbc2a7e..f53eb5aeff 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap @@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_missing_r ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..53, body: [ ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, module: Some( Identifier { id: Name("x"), range: 5..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 15..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 15..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -48,15 +48,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..25, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..25, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, value: Int( 1, @@ -66,7 +66,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, value: Int( 1, @@ -79,33 +79,33 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..46, module: Some( Identifier { id: Name("x"), range: 31..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 41..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 41..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 44..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 44..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -115,15 +115,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..52, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..52, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, value: Int( 2, @@ -133,7 +133,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap index 0c0d1ff705..616bb3d4c5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap @@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_star_with ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..87, body: [ ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, module: Some( Identifier { id: Name("x"), range: 5..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("*"), range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -48,43 +48,43 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..40, module: Some( Identifier { id: Name("x"), range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 36..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("*"), range: 36..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -94,39 +94,39 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..64, module: Some( Identifier { id: Name("x"), range: 46..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 55..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("*"), range: 55..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 58..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 58..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("b"), range: 63..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -136,43 +136,43 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..86, module: Some( Identifier { id: Name("x"), range: 70..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 79..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("*"), range: 79..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 82..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("*"), range: 82..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 85..86, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 85..86, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap index 4708a3d670..778e7d2381 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap @@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/err/from_import_unparenth ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..59, body: [ ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, module: Some( Identifier { id: Name("a"), range: 5..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -38,29 +38,29 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..38, module: Some( Identifier { id: Name("a"), range: 22..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 31..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 31..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("c"), range: 36..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -70,33 +70,33 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..58, module: Some( Identifier { id: Name("a"), range: 44..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap index 2b793eb3a0..8774db9904 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_empty_bo ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..36, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..9, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -39,21 +37,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..28, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 15..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 18..20, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -63,7 +59,7 @@ Module( returns: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, id: Name("int"), ctx: Load, @@ -75,12 +71,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..35, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("x"), ctx: Store, @@ -89,7 +85,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..35, value: Int( 42, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap index 630b9274b7..a3bef4f4b9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_invalid_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..74, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..9, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -36,11 +34,11 @@ Module( returns: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..17, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("int"), ctx: Load, @@ -53,11 +51,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, }, ), @@ -68,21 +66,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..47, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 27..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 30..32, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -92,11 +88,11 @@ Module( returns: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..41, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..41, id: Name("int"), ctx: Load, @@ -109,11 +105,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..47, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..47, }, ), @@ -124,21 +120,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..73, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 52..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 55..57, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -148,12 +142,12 @@ Module( returns: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..68, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..68, id: Name("x"), ctx: Load, @@ -166,11 +160,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..73, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..73, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap index 6b3b63253f..1ee0f8c743 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_missing_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..31, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, is_async: false, decorator_list: [], name: Identifier { id: Name(""), range: 3..3, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 4..6, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,11 +35,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..11, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..11, }, ), @@ -52,21 +50,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..30, is_async: false, decorator_list: [], name: Identifier { id: Name(""), range: 15..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 16..18, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -76,7 +72,7 @@ Module( returns: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, id: Name("int"), ctx: Load, @@ -86,11 +82,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..30, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..30, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap index e8b2fbeeac..36593a9900 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_missing_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..9, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,11 +35,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..18, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..18, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap index f3b024f7e5..9028296eeb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap @@ -7,43 +7,41 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_unclosed ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..74, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..18, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..14, id: Name("int"), ctx: Load, @@ -55,14 +53,14 @@ Module( }, ParameterWithDefault { range: 16..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 16..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -79,21 +77,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..43, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 23..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 26..28, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -104,12 +100,12 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..43, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..43, value: Int( 42, @@ -124,38 +120,36 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..74, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 48..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 51..74, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 52..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 52..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..58, id: Name("int"), ctx: Load, @@ -167,19 +161,19 @@ Module( }, ParameterWithDefault { range: 60..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 60..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..66, id: Name("str"), ctx: Load, @@ -191,21 +185,21 @@ Module( }, ParameterWithDefault { range: 67..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 67..68, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 67..68, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..73, value: Int( 10, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap index f8ef4f8169..78bc5e9f73 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap @@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_unclosed ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..47, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..39, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 7..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T1"), range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -42,11 +42,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 12..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T2"), range: 13..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -56,21 +56,19 @@ Module( ), parameters: Parameters { range: 15..21, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -78,14 +76,14 @@ Module( }, ParameterWithDefault { range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -100,16 +98,16 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..39, value: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..39, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("a"), ctx: Load, @@ -118,7 +116,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("b"), ctx: Load, @@ -134,12 +132,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..46, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("x"), ctx: Store, @@ -148,7 +146,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..46, value: Int( 10, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap index a2e19de94c..fc72f4209f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_def_unparent ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..50, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..9, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -36,12 +34,12 @@ Module( returns: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..17, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, id: Name("int"), ctx: Load, @@ -56,11 +54,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, }, ), @@ -71,21 +69,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..49, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 27..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 30..32, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -95,12 +91,12 @@ Module( returns: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..44, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..39, id: Name("int"), ctx: Load, @@ -108,7 +104,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..44, id: Name("str"), ctx: Load, @@ -123,11 +119,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..49, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..49, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap index 18039d0ce0..259c43f1e3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap @@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/function_type_params_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..79, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..61, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 48..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 51..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -44,9 +44,7 @@ Module( ), parameters: Parameters { range: 54..56, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -57,11 +55,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, }, ), @@ -72,27 +70,25 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..78, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 66..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 69..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [], }, ), parameters: Parameters { range: 71..73, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -103,11 +99,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..78, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..78, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap index 6255c8fe59..5971aa62c7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap @@ -7,12 +7,12 @@ input_file: crates/ruff_python_parser/resources/inline/err/global_stmt_empty.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, body: [ Global( StmtGlobal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, names: [], }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap index d179c96eef..c80bc04505 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap @@ -7,34 +7,34 @@ input_file: crates/ruff_python_parser/resources/inline/err/global_stmt_expressio ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, body: [ Global( StmtGlobal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, names: [ Identifier { id: Name("x"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..12, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..12, op: UAdd, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap index 232acca04d..6891697042 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap @@ -7,43 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/err/global_stmt_trailing_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..32, body: [ Global( StmtGlobal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, names: [], }, ), Global( StmtGlobal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..18, names: [ Identifier { id: Name("x"), range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, ), Global( StmtGlobal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..31, names: [ Identifier { id: Name("x"), range: 26..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, Identifier { id: Name("y"), range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap index 888e539c24..d8ac7c86be 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_elif_missing_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..46, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..45, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("x"), ctx: Load, @@ -25,7 +25,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..14, }, ), @@ -33,11 +33,11 @@ Module( elif_else_clauses: [ ElifElseClause { range: 15..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, id: Name("y"), ctx: Load, @@ -47,7 +47,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..30, }, ), @@ -55,12 +55,12 @@ Module( }, ElifElseClause { range: 31..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..45, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap index 0b8fecc048..1d74c36f48 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_empty_body.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, value: true, }, @@ -27,15 +27,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..14, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..14, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 1, @@ -45,7 +45,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap index ee46056de5..356e404b04 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_invalid_elif_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..56, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..55, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("x"), ctx: Load, @@ -25,7 +25,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..14, }, ), @@ -33,15 +33,15 @@ Module( elif_else_clauses: [ ElifElseClause { range: 15..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..22, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, id: Name("x"), ctx: Load, @@ -54,7 +54,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..32, }, ), @@ -62,16 +62,16 @@ Module( }, ElifElseClause { range: 33..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..45, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, id: Name("x"), ctx: Load, @@ -84,7 +84,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..55, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap index 0562b031f9..c06836fcdb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_invalid_test_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..48, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, test: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..5, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Load, @@ -32,11 +32,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..10, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..10, }, ), @@ -48,16 +48,16 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..26, test: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..21, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, id: Name("x"), ctx: Load, @@ -69,11 +69,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..26, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..26, }, ), @@ -85,15 +85,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..47, test: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..42, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("x"), ctx: Load, @@ -104,11 +104,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..47, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..47, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap index 091fe218f5..8092bc7d7c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_missing_colon ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..25, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("x"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..18, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("x"), ctx: Load, @@ -41,7 +41,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..18, }, ), @@ -51,12 +51,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..24, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("a"), ctx: Store, @@ -65,7 +65,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap index 13cacd4b10..421ce18c82 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_missing_test. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..2, id: Name(""), ctx: Invalid, @@ -25,11 +25,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..8, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..8, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap index bef4a1b852..e932a526c4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/if_stmt_misspelled_el ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..47, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, value: true, }, @@ -24,7 +24,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..17, }, ), @@ -34,11 +34,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..22, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..21, id: Name("elf"), ctx: Store, @@ -46,7 +46,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..22, id: Name(""), ctx: Invalid, @@ -58,13 +58,13 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..31, }, ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..46, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap index 887ae67220..a883b9e411 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/inline/err/implicitly_concatenat ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..47, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello", flags: StringLiteralFlags { quote_style: Single, @@ -38,15 +38,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..20, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..20, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, value: Int( 1, @@ -56,7 +56,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, value: Int( 1, @@ -69,11 +69,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..40, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..40, value: FStringValue { inner: Concatenated( @@ -81,7 +81,7 @@ Module( Literal( StringLiteral { range: 21..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello", flags: StringLiteralFlags { quote_style: Single, @@ -93,22 +93,22 @@ Module( FString( FString { range: 29..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 31..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world ", }, ), Interpolation( InterpolatedElement { range: 37..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("x"), ctx: Load, @@ -136,15 +136,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..46, value: BinOp( ExprBinOp { - 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( 2, @@ -154,7 +154,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..46, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap index 59016cc425..58734d3b8f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/implicitly_concatenat ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..85, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..31, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..31, value: FStringValue { inner: Concatenated( @@ -24,7 +24,7 @@ Module( Literal( StringLiteral { range: 6..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello", flags: StringLiteralFlags { quote_style: Single, @@ -36,22 +36,22 @@ Module( FString( FString { range: 18..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 20..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world ", }, ), Interpolation( InterpolatedElement { range: 26..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("x"), ctx: Load, @@ -79,15 +79,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..37, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..37, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, value: Int( 1, @@ -97,7 +97,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, value: Int( 1, @@ -110,17 +110,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..51, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..51, value: StringLiteralValue { inner: Single( StringLiteral { range: 44..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "first", flags: StringLiteralFlags { quote_style: Single, @@ -136,23 +136,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..76, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..76, value: FStringValue { inner: Single( FString( FString { range: 68..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 70..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "third", }, ), @@ -172,15 +172,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..84, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..84, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, value: Int( 2, @@ -190,7 +190,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap index 23ff8ca3c4..33c7bf11e6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/import_alias_missing_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, names: [ Alias { range: 7..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap index b198a71477..74adfe2d52 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap @@ -7,12 +7,12 @@ input_file: crates/ruff_python_parser/resources/inline/err/import_stmt_empty.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, names: [], }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap index dedb2fd84b..2db170e781 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap @@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/inline/err/import_stmt_parenthes ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..25, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, names: [], }, ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..10, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("a"), ctx: Load, @@ -33,23 +33,23 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..17, names: [], }, ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..24, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..24, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("a"), ctx: Load, @@ -57,7 +57,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("b"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap index 81439cdee2..84de08d960 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap @@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/inline/err/import_stmt_star_impo ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, names: [], }, ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..8, id: Name(""), ctx: Invalid, @@ -40,16 +40,16 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..18, names: [ Alias { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -58,20 +58,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..23, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..23, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..20, id: Name(""), ctx: Invalid, @@ -82,7 +82,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap index d9ea1890a5..5179defd2f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap @@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/err/import_stmt_trailing_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, names: [], }, ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..21, names: [ Alias { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap index 815e902255..87faffde66 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap @@ -7,32 +7,32 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_annotation_cl ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..247, body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, decorator_list: [], name: Identifier { id: Name("F"), range: 6..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 7..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -44,15 +44,15 @@ Module( arguments: Some( Arguments { range: 10..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..20, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, id: Name("y"), ctx: Store, @@ -60,7 +60,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..20, id: Name("list"), ctx: Load, @@ -75,11 +75,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..26, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..26, }, ), @@ -90,27 +90,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..53, decorator_list: [], name: Identifier { id: Name("I"), range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 34..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 35..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 35..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -122,16 +122,16 @@ Module( arguments: Some( Arguments { range: 37..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..46, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..46, value: Int( 1, @@ -148,11 +148,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..53, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..53, }, ), @@ -163,27 +163,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..85, decorator_list: [], name: Identifier { id: Name("J"), range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 61..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 62..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 62..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -195,15 +195,15 @@ Module( arguments: Some( Arguments { range: 64..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..78, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, value: Int( 1, @@ -219,11 +219,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..85, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..85, }, ), @@ -234,37 +234,37 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..112, decorator_list: [], name: Identifier { id: Name("K"), range: 92..93, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 93..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 94..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 94..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..105, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, value: Int( 1, @@ -285,11 +285,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, }, ), @@ -300,36 +300,36 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..162, decorator_list: [], name: Identifier { id: Name("L"), range: 143..144, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 144..157, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 145..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 145..146, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..155, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..150, id: Name("x"), ctx: Store, @@ -337,7 +337,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..155, value: Int( 1, @@ -357,11 +357,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..162, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..162, }, ), @@ -372,27 +372,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..219, decorator_list: [], name: Identifier { id: Name("M"), range: 199..200, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 200..203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 201..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 201..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -404,15 +404,15 @@ Module( arguments: Some( Arguments { range: 203..214, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 205..212, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..212, value: Int( 1, @@ -428,11 +428,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 216..219, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 216..219, }, ), @@ -443,36 +443,36 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..246, decorator_list: [], name: Identifier { id: Name("N"), range: 226..227, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 227..241, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 228..240, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 228..229, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..239, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..239, value: Int( 1, @@ -492,11 +492,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 243..246, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 243..246, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap index 2953a62e55..7f6d5bbebf 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap @@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_annotation_fu ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..987, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, is_async: false, decorator_list: [], name: Identifier { id: Name("d"), range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 5..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 6..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 6..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -44,9 +44,7 @@ Module( ), parameters: Parameters { range: 8..10, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -56,11 +54,11 @@ Module( returns: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..22, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, value: Int( 1, @@ -73,11 +71,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, }, ), @@ -88,28 +86,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..58, is_async: false, decorator_list: [], name: Identifier { id: Name("e"), range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 34..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 35..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 35..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -120,30 +118,28 @@ Module( ), parameters: Parameters { range: 37..53, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 38..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 38..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 38..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..51, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..51, value: Int( 1, @@ -165,11 +161,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..58, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..58, }, ), @@ -180,28 +176,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..86, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 63..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 64..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 65..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 65..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -212,9 +208,7 @@ Module( ), parameters: Parameters { range: 67..69, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -224,11 +218,11 @@ Module( returns: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..80, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, id: Name("y"), ctx: Store, @@ -236,7 +230,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, value: Int( 3, @@ -249,11 +243,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..86, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..86, }, ), @@ -264,28 +258,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..115, is_async: false, decorator_list: [], name: Identifier { id: Name("g"), range: 91..92, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 92..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 93..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 93..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -296,30 +290,28 @@ Module( ), parameters: Parameters { range: 95..110, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 96..109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 96..109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 96..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..108, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, id: Name("x"), ctx: Store, @@ -327,7 +319,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..108, value: Int( 1, @@ -349,11 +341,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..115, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..115, }, ), @@ -364,28 +356,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..143, is_async: false, decorator_list: [], name: Identifier { id: Name("h"), range: 120..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 121..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 122..123, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 122..123, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -396,31 +388,29 @@ Module( ), parameters: Parameters { range: 124..138, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 125..137, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 125..137, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 125..126, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..136, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, value: Int( 1, @@ -443,11 +433,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..143, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..143, }, ), @@ -458,28 +448,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..172, is_async: false, decorator_list: [], name: Identifier { id: Name("j"), range: 148..149, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 149..152, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 150..151, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 150..151, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -490,9 +480,7 @@ Module( ), parameters: Parameters { range: 152..154, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -502,12 +490,12 @@ Module( returns: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..166, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..166, value: Int( 1, @@ -521,11 +509,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..172, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..172, }, ), @@ -536,28 +524,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 173..205, is_async: false, decorator_list: [], name: Identifier { id: Name("l"), range: 177..178, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 178..181, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 179..180, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 179..180, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -568,30 +556,28 @@ Module( ), parameters: Parameters { range: 181..200, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 182..199, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 182..199, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 182..183, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..198, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..198, value: Int( 1, @@ -613,11 +599,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..205, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..205, }, ), @@ -628,28 +614,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..239, is_async: false, decorator_list: [], name: Identifier { id: Name("n"), range: 210..211, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 211..214, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 212..213, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 212..213, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -660,9 +646,7 @@ Module( ), parameters: Parameters { range: 214..216, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -672,11 +656,11 @@ Module( returns: Some( YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..233, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..233, value: Int( 1, @@ -689,11 +673,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..239, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..239, }, ), @@ -704,38 +688,38 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..266, is_async: false, decorator_list: [], name: Identifier { id: Name("p"), range: 244..245, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 245..259, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 246..258, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 246..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..257, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 256..257, value: Int( 1, @@ -754,9 +738,7 @@ Module( ), parameters: Parameters { range: 259..261, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -767,11 +749,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 263..266, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 263..266, }, ), @@ -782,39 +764,39 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 297..324, is_async: false, decorator_list: [], name: Identifier { id: Name("q"), range: 301..302, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 302..317, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 303..316, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 303..304, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 308..315, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 314..315, value: Int( 1, @@ -832,9 +814,7 @@ Module( ), parameters: Parameters { range: 317..319, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -845,11 +825,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..324, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..324, }, ), @@ -860,38 +840,38 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 356..385, is_async: false, decorator_list: [], name: Identifier { id: Name("r"), range: 360..361, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 361..378, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 362..377, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 363..365, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 369..376, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 375..376, value: Int( 1, @@ -909,9 +889,7 @@ Module( ), parameters: Parameters { range: 378..380, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -922,11 +900,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 382..385, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 382..385, }, ), @@ -937,38 +915,38 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 420..450, is_async: false, decorator_list: [], name: Identifier { id: Name("s"), range: 424..425, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 425..443, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 426..442, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 428..430, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 434..441, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 440..441, value: Int( 1, @@ -986,9 +964,7 @@ Module( ), parameters: Parameters { range: 443..445, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -999,11 +975,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 447..450, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 447..450, }, ), @@ -1014,37 +990,37 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 481..506, is_async: false, decorator_list: [], name: Identifier { id: Name("t"), range: 485..486, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 486..499, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 487..498, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 487..488, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 491..497, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 491..492, id: Name("x"), ctx: Store, @@ -1052,7 +1028,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 496..497, value: Int( 1, @@ -1070,9 +1046,7 @@ Module( ), parameters: Parameters { range: 499..501, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -1083,11 +1057,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 503..506, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 503..506, }, ), @@ -1098,38 +1072,38 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 543..569, is_async: false, decorator_list: [], name: Identifier { id: Name("u"), range: 547..548, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 548..562, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 549..561, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 549..550, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 554..560, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 554..555, id: Name("x"), ctx: Store, @@ -1137,7 +1111,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 559..560, value: Int( 1, @@ -1154,9 +1128,7 @@ Module( ), parameters: Parameters { range: 562..564, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -1167,11 +1139,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 566..569, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 566..569, }, ), @@ -1182,37 +1154,37 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 607..635, is_async: false, decorator_list: [], name: Identifier { id: Name("v"), range: 611..612, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 612..628, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 613..627, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 614..616, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 620..626, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 620..621, id: Name("x"), ctx: Store, @@ -1220,7 +1192,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 625..626, value: Int( 1, @@ -1237,9 +1209,7 @@ Module( ), parameters: Parameters { range: 628..630, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -1250,11 +1220,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 632..635, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 632..635, }, ), @@ -1265,37 +1235,37 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 676..705, is_async: false, decorator_list: [], name: Identifier { id: Name("w"), range: 680..681, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 681..698, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 682..697, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 684..686, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 690..696, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 690..691, id: Name("x"), ctx: Store, @@ -1303,7 +1273,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 695..696, value: Int( 1, @@ -1320,9 +1290,7 @@ Module( ), parameters: Parameters { range: 698..700, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -1333,11 +1301,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 702..705, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 702..705, }, ), @@ -1348,37 +1316,37 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 742..768, is_async: false, decorator_list: [], name: Identifier { id: Name("t"), range: 746..747, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 747..761, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 748..760, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 748..749, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 752..759, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 758..759, value: Int( 1, @@ -1396,9 +1364,7 @@ Module( ), parameters: Parameters { range: 761..763, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -1409,11 +1375,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 765..768, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 765..768, }, ), @@ -1424,38 +1390,38 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 800..827, is_async: false, decorator_list: [], name: Identifier { id: Name("u"), range: 804..805, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 805..820, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 806..819, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 806..807, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 811..818, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 817..818, value: Int( 1, @@ -1472,9 +1438,7 @@ Module( ), parameters: Parameters { range: 820..822, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -1485,11 +1449,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 824..827, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 824..827, }, ), @@ -1500,37 +1464,37 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 860..889, is_async: false, decorator_list: [], name: Identifier { id: Name("v"), range: 864..865, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 865..882, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 866..881, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 867..869, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 873..880, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 879..880, value: Int( 1, @@ -1547,9 +1511,7 @@ Module( ), parameters: Parameters { range: 882..884, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -1560,11 +1522,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 886..889, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 886..889, }, ), @@ -1575,37 +1537,37 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 925..955, is_async: false, decorator_list: [], name: Identifier { id: Name("w"), range: 929..930, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 930..948, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 931..947, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 933..935, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 939..946, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 945..946, value: Int( 1, @@ -1622,9 +1584,7 @@ Module( ), parameters: Parameters { range: 948..950, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -1635,11 +1595,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 952..955, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 952..955, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap index 81e3240ff7..132507c7c7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_annotation_fu ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..316, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..68, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 48..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 49..51, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -36,11 +34,11 @@ Module( returns: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..62, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("y"), ctx: Store, @@ -48,7 +46,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..62, value: Int( 3, @@ -61,11 +59,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..68, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..68, }, ), @@ -76,42 +74,40 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..94, is_async: false, decorator_list: [], name: Identifier { id: Name("g"), range: 73..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 74..89, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 75..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 75..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 75..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..87, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, id: Name("x"), ctx: Store, @@ -119,7 +115,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..87, value: Int( 1, @@ -141,11 +137,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..94, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..94, }, ), @@ -156,21 +152,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..235, is_async: false, decorator_list: [], name: Identifier { id: Name("outer"), range: 99..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 104..106, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -181,43 +175,41 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..136, is_async: false, decorator_list: [], name: Identifier { id: Name("i"), range: 116..117, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 117..131, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 118..130, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 118..130, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 118..119, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..129, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, value: Int( 1, @@ -240,11 +232,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..136, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..136, }, ), @@ -255,21 +247,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..166, is_async: false, decorator_list: [], name: Identifier { id: Name("k"), range: 145..146, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 146..148, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -279,12 +269,12 @@ Module( returns: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..160, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..160, value: Int( 1, @@ -298,11 +288,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..166, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..166, }, ), @@ -313,42 +303,40 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..200, is_async: false, decorator_list: [], name: Identifier { id: Name("m"), range: 175..176, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 176..195, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 177..194, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 177..194, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 177..178, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..193, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..193, value: Int( 1, @@ -370,11 +358,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..200, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..200, }, ), @@ -385,21 +373,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 205..235, is_async: false, decorator_list: [], name: Identifier { id: Name("o"), range: 209..210, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 210..212, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -409,11 +395,11 @@ Module( returns: Some( YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..229, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..229, value: Int( 1, @@ -426,11 +412,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..235, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..235, }, ), @@ -444,21 +430,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..315, is_async: true, decorator_list: [], name: Identifier { id: Name("outer"), range: 246..251, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 251..253, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -469,21 +453,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..284, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 263..264, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 264..266, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -493,11 +475,11 @@ Module( returns: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..278, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 277..278, value: Int( 1, @@ -510,11 +492,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..284, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..284, }, ), @@ -525,42 +507,40 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 289..315, is_async: false, decorator_list: [], name: Identifier { id: Name("g"), range: 293..294, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 294..310, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 295..309, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 295..309, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 295..298, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..308, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 307..308, value: Int( 1, @@ -582,11 +562,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..315, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..315, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap index 78ac67583b..f3fdd11ffe 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_annotation_py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..144, body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..55, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, id: Name("a"), ctx: Store, @@ -24,11 +24,11 @@ Module( ), annotation: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..54, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..49, id: Name("x"), ctx: Store, @@ -36,7 +36,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, value: Int( 1, @@ -51,21 +51,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..107, is_async: false, decorator_list: [], name: Identifier { id: Name("outer"), range: 60..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 65..67, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -76,11 +74,11 @@ Module( body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..85, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..74, id: Name("b"), ctx: Store, @@ -88,12 +86,12 @@ Module( ), annotation: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..84, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, value: Int( 1, @@ -109,11 +107,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..107, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("c"), ctx: Store, @@ -121,11 +119,11 @@ Module( ), annotation: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..106, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, value: Int( 1, @@ -143,21 +141,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..143, is_async: true, decorator_list: [], name: Identifier { id: Name("outer"), range: 118..123, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 123..125, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -168,11 +164,11 @@ Module( body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..143, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..132, id: Name("d"), ctx: Store, @@ -180,11 +176,11 @@ Module( ), annotation: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..142, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..142, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap index 10e387a20b..61e633131d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_annotation_ty ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..406, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,26 +25,26 @@ Module( type_params: Some( TypeParams { range: 6..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 7..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..18, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, value: Int( 1, @@ -63,7 +63,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..26, id: Name("int"), ctx: Load, @@ -73,11 +73,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..75, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, id: Name("X"), ctx: Store, @@ -86,27 +86,27 @@ Module( type_params: Some( TypeParams { range: 54..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 55..68, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 55..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..67, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, value: Int( 1, @@ -124,7 +124,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..75, id: Name("int"), ctx: Load, @@ -134,11 +134,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..127, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..104, id: Name("X"), ctx: Store, @@ -147,26 +147,26 @@ Module( type_params: Some( TypeParams { range: 104..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 105..120, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 106..108, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..119, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..119, value: Int( 1, @@ -184,7 +184,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..127, id: Name("int"), ctx: Load, @@ -194,11 +194,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..183, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..159, id: Name("X"), ctx: Store, @@ -207,26 +207,26 @@ Module( type_params: Some( TypeParams { range: 159..177, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 160..176, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 162..164, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..175, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..175, value: Int( 1, @@ -244,7 +244,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 180..183, id: Name("int"), ctx: Load, @@ -254,11 +254,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 205..223, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 210..211, id: Name("Y"), ctx: Store, @@ -267,12 +267,12 @@ Module( type_params: None, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..222, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..222, value: Int( 1, @@ -286,11 +286,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..271, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..260, id: Name("Y"), ctx: Store, @@ -299,11 +299,11 @@ Module( type_params: None, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..270, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..265, id: Name("x"), ctx: Store, @@ -311,7 +311,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..270, value: Int( 1, @@ -324,11 +324,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 308..334, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..314, id: Name("Y"), ctx: Store, @@ -337,25 +337,25 @@ Module( type_params: Some( TypeParams { range: 314..328, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 315..327, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 315..316, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..326, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 325..326, value: Int( 1, @@ -373,7 +373,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..334, id: Name("int"), ctx: Load, @@ -383,11 +383,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 357..375, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 362..363, id: Name("Y"), ctx: Store, @@ -396,11 +396,11 @@ Module( type_params: None, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 367..374, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 373..374, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap index 67b56f4617..635e860d01 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_byte_literal. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..44, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 0..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [], flags: BytesLiteralFlags { quote_style: Single, @@ -38,17 +38,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..26, value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..26, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 13..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [], flags: BytesLiteralFlags { quote_style: Double, @@ -66,17 +66,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..43, value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..43, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 27..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [], flags: BytesLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap index 444e3dd979..f214888ea3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_del_target.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..75, body: [ Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, targets: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..9, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Load, @@ -30,7 +30,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, value: Int( 1, @@ -44,25 +44,25 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..22, targets: [ Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..22, items: [ DictItem { key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..18, value: StringLiteralValue { inner: Single( StringLiteral { range: 15..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Single, @@ -77,7 +77,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, value: Int( 1, @@ -93,23 +93,23 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..37, targets: [ Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..37, elts: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..31, value: StringLiteralValue { inner: Single( StringLiteral { range: 28..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Single, @@ -123,13 +123,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..36, value: StringLiteralValue { inner: Single( StringLiteral { range: 33..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "y", flags: StringLiteralFlags { quote_style: Single, @@ -149,32 +149,32 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..74, targets: [ NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..46, }, ), BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..52, value: true, }, ), BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..59, value: false, }, ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..62, value: Int( 1, @@ -183,7 +183,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..67, value: Float( 1.0, @@ -192,13 +192,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..74, value: StringLiteralValue { inner: Single( StringLiteral { range: 69..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "abc", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap index d401ee2d55..88875b56f9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap @@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_fstring_liter ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..58, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, value: FStringValue { inner: Single( FString( FString { range: 0..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 2..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", }, ), @@ -48,23 +48,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..57, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..57, value: FStringValue { inner: Single( FString( FString { range: 27..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 31..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap index 93f0879fae..0dbe2ee507 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/inline/err/invalid_string_litera ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..56, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..25, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..25, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, @@ -38,17 +38,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..55, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..55, value: StringLiteralValue { inner: Single( StringLiteral { range: 26..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap index 3853b04afd..678ef97091 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/irrefutable_case_patt ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..317, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..61, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -25,17 +25,17 @@ Module( cases: [ MatchCase { range: 13..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 18..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("var"), range: 18..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -44,11 +44,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..26, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..26, }, ), @@ -58,14 +58,14 @@ Module( }, MatchCase { range: 50..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 55..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, value: Int( 2, @@ -78,11 +78,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, }, ), @@ -95,11 +95,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..102, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Load, @@ -108,11 +108,11 @@ Module( cases: [ MatchCase { range: 75..86, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 80..81, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -121,11 +121,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..86, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..86, }, ), @@ -135,14 +135,14 @@ Module( }, MatchCase { range: 91..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 96..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, value: Int( 2, @@ -155,11 +155,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..102, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..102, }, ), @@ -172,11 +172,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..222, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..132, id: Name("x"), ctx: Load, @@ -185,22 +185,22 @@ Module( cases: [ MatchCase { range: 138..160, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 143..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchAs( PatternMatchAs { range: 143..147, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("var1"), range: 143..147, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -210,7 +210,7 @@ Module( Identifier { id: Name("var2"), range: 151..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -219,11 +219,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..160, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..160, }, ), @@ -233,14 +233,14 @@ Module( }, MatchCase { range: 211..222, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 216..217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 216..217, value: Int( 2, @@ -253,11 +253,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..222, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..222, }, ), @@ -270,11 +270,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..316, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 229..230, id: Name("x"), ctx: Load, @@ -283,23 +283,23 @@ Module( cases: [ MatchCase { range: 236..264, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 241..259, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 241..253, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..253, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..245, id: Name("enum"), ctx: Load, @@ -308,7 +308,7 @@ Module( attr: Identifier { id: Name("variant"), range: 246..253, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -318,13 +318,13 @@ Module( MatchAs( PatternMatchAs { range: 256..259, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("var"), range: 256..259, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -336,11 +336,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 261..264, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 261..264, }, ), @@ -350,14 +350,14 @@ Module( }, MatchCase { range: 305..316, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 310..311, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..311, value: Int( 2, @@ -370,11 +370,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..316, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..316, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap index 305adc1eea..cc4ffef040 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/iter_unpack_return_py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..91, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..59, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..47, id: Name("rest"), ctx: Store, @@ -26,12 +26,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..59, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 4, @@ -40,7 +40,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 5, @@ -49,7 +49,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, value: Int( 6, @@ -65,21 +65,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..90, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 65..67, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -90,17 +88,17 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..90, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..90, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..77, value: Int( 1, @@ -109,7 +107,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, value: Int( 2, @@ -118,7 +116,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, value: Int( 3, @@ -127,11 +125,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..90, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..90, id: Name("rest"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap index f3e6ac63aa..09bb355569 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/iter_unpack_yield_py3 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..128, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..59, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..47, id: Name("rest"), ctx: Store, @@ -26,12 +26,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..59, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 4, @@ -40,7 +40,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 5, @@ -49,7 +49,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, value: Int( 6, @@ -65,21 +65,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..89, is_async: false, decorator_list: [], name: Identifier { id: Name("g"), range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 65..67, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -90,21 +88,21 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..89, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..89, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..89, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, value: Int( 1, @@ -113,7 +111,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, value: Int( 2, @@ -122,7 +120,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, value: Int( 3, @@ -131,11 +129,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..89, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..89, id: Name("rest"), ctx: Load, @@ -159,21 +157,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..127, is_async: false, decorator_list: [], name: Identifier { id: Name("h"), range: 94..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 95..97, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -184,21 +180,21 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..127, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..127, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..127, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, value: Int( 1, @@ -207,17 +203,17 @@ Module( ), Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..123, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..123, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..116, value: Int( 2, @@ -226,11 +222,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..123, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..123, id: Name("rest"), ctx: Load, @@ -249,7 +245,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..127, value: Int( 3, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap index 920e8ab7d7..a438ef9c46 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap @@ -7,35 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/lambda_body_with_star ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..62, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, parameters: Some( Parameters { range: 7..8, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -49,11 +47,11 @@ Module( ), body: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..12, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, id: Name("y"), ctx: Load, @@ -68,35 +66,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..26, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..26, elts: [ Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..25, parameters: Some( Parameters { range: 20..21, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 20..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 20..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 20..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -110,11 +106,11 @@ Module( ), body: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..25, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("y"), ctx: Load, @@ -134,35 +130,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..42, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..42, elts: [ Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..39, parameters: Some( Parameters { range: 34..35, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 34..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 34..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 34..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -176,11 +170,11 @@ Module( ), body: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..39, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("y"), ctx: Load, @@ -193,7 +187,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("z"), ctx: Load, @@ -208,30 +202,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..61, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..61, parameters: Some( Parameters { range: 50..51, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 50..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 50..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 50..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -245,17 +237,17 @@ Module( ), body: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..61, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..61, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, id: Name("y"), ctx: Load, @@ -263,7 +255,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("z"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap index 1b3cd95472..50eb38666e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap @@ -7,35 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/err/lambda_body_with_yiel ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..41, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, parameters: Some( Parameters { range: 7..8, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -49,12 +47,12 @@ Module( ), body: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..17, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("y"), ctx: Load, @@ -69,30 +67,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..40, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..40, parameters: Some( Parameters { range: 25..26, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 25..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 25..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 25..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -106,11 +102,11 @@ Module( ), body: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..40, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap index f4cf349ddd..ee6bbd4bd0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_before_py310.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..79, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..78, subject: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 2, @@ -26,14 +26,14 @@ Module( cases: [ MatchCase { range: 58..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 63..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, value: Int( 1, @@ -46,7 +46,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..78, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap index e4e0b0db63..f30f13e7be 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_classify_as_key ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..33, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..32, subject: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..15, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, id: Name("foo"), ctx: Load, @@ -33,11 +33,11 @@ Module( cases: [ MatchCase { range: 21..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 26..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -46,11 +46,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap index 5ce94bf138..531219c2b7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_classify_as_key ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..39, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, subject: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..10, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..10, id: Name("foo"), ctx: Load, @@ -32,11 +32,11 @@ Module( cases: [ MatchCase { range: 27..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 32..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -45,11 +45,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..38, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..38, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap index 6415f9724a..a3b0a5de38 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_expected_colon. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..29, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, subject: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..12, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, value: Int( 1, @@ -30,7 +30,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, value: Int( 2, @@ -44,11 +44,11 @@ Module( cases: [ MatchCase { range: 17..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 22..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -57,11 +57,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap index 273c444e53..3f165716fd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_expect_ind ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..23, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..9, id: Name("foo"), ctx: Load, @@ -25,11 +25,11 @@ Module( cases: [ MatchCase { range: 11..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -38,11 +38,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap index 528b87d4e7..491b242611 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_expected_c ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..61, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -27,12 +27,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..18, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("x"), ctx: Store, @@ -41,7 +41,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, value: Int( 1, @@ -52,11 +52,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..32, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, id: Name("x"), ctx: Load, @@ -67,11 +67,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..60, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("y"), ctx: Load, @@ -80,11 +80,11 @@ Module( cases: [ MatchCase { range: 49..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -93,11 +93,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap index 0f5a1d34f4..73bce3400e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_invalid_gu ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..100, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..30, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -25,17 +25,17 @@ Module( cases: [ MatchCase { range: 13..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -43,11 +43,11 @@ Module( guard: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..25, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("a"), ctx: Load, @@ -60,11 +60,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..30, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..30, }, ), @@ -77,11 +77,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..63, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, id: Name("x"), ctx: Load, @@ -90,17 +90,17 @@ Module( cases: [ MatchCase { range: 44..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 49..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 49..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -108,11 +108,11 @@ Module( guard: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..57, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("a"), ctx: Load, @@ -125,11 +125,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, }, ), @@ -142,11 +142,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..99, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, id: Name("x"), ctx: Load, @@ -155,17 +155,17 @@ Module( cases: [ MatchCase { range: 77..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 82..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 82..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -173,12 +173,12 @@ Module( guard: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..94, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, id: Name("x"), ctx: Load, @@ -191,11 +191,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap index 13285ab3c4..1db01735fb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_invalid_su ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..131, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..27, subject: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..9, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("x"), ctx: Load, @@ -32,11 +32,11 @@ Module( cases: [ MatchCase { range: 16..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -45,11 +45,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, }, ), @@ -62,26 +62,26 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..99, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..82, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..79, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..79, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("x"), ctx: Load, @@ -89,7 +89,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, id: Name("y"), ctx: Load, @@ -103,7 +103,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, id: Name("z"), ctx: Load, @@ -117,11 +117,11 @@ Module( cases: [ MatchCase { range: 88..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 93..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -130,11 +130,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, }, ), @@ -147,16 +147,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..130, subject: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..113, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..113, id: Name("x"), ctx: Load, @@ -168,11 +168,11 @@ Module( cases: [ MatchCase { range: 119..130, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 124..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -181,11 +181,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..130, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..130, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap index bda3c6e5c3..ebaf34464b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_missing_gu ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..27, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -25,17 +25,17 @@ Module( cases: [ MatchCase { range: 13..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -44,11 +44,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap index 3b604f0505..ddc7872be1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_missing_pa ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..23, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -25,14 +25,14 @@ Module( cases: [ MatchCase { range: 13..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 17..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..17, id: Name(""), ctx: Invalid, @@ -44,11 +44,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap index f22cb551fc..b904a97ae4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_no_newline ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..23, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..9, id: Name("foo"), ctx: Load, @@ -25,11 +25,11 @@ Module( cases: [ MatchCase { range: 11..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -38,11 +38,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap index 1bfa4ac064..8ad5469d41 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/match_stmt_single_sta ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..27, subject: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..10, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..10, id: Name("foo"), ctx: Load, @@ -32,11 +32,11 @@ Module( cases: [ MatchCase { range: 16..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -45,11 +45,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap index 192d87e0b5..f79a6c0478 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/mixed_bytes_and_non_b ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..64, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: StringLiteralValue { inner: Concatenated( @@ -24,7 +24,7 @@ Module( strings: [ StringLiteral { range: 0..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "first", flags: StringLiteralFlags { quote_style: Single, @@ -34,7 +34,7 @@ Module( }, StringLiteral { range: 8..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, @@ -53,11 +53,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..36, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..36, value: FStringValue { inner: Concatenated( @@ -65,12 +65,12 @@ Module( FString( FString { range: 18..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 20..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "first", }, ), @@ -85,7 +85,7 @@ Module( Literal( StringLiteral { range: 27..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, @@ -103,11 +103,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..63, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..63, value: FStringValue { inner: Concatenated( @@ -115,7 +115,7 @@ Module( Literal( StringLiteral { range: 37..44, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "first", flags: StringLiteralFlags { quote_style: Single, @@ -127,12 +127,12 @@ Module( FString( FString { range: 45..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 47..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "second", }, ), @@ -147,7 +147,7 @@ Module( Literal( StringLiteral { range: 55..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap index c3e7a8341c..fbedd8e0ee 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/multiple_assignment_i ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..456, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..444, subject: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, value: Int( 2, @@ -26,22 +26,22 @@ Module( cases: [ MatchCase { range: 13..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 18..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -49,13 +49,13 @@ Module( MatchAs( PatternMatchAs { range: 22..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("z"), range: 22..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -63,13 +63,13 @@ Module( MatchAs( PatternMatchAs { range: 25..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 25..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -81,11 +81,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, }, ), @@ -95,22 +95,22 @@ Module( }, MatchCase { range: 54..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 59..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -118,13 +118,13 @@ Module( MatchAs( PatternMatchAs { range: 63..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("z"), range: 63..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -132,12 +132,12 @@ Module( MatchStar( PatternMatchStar { range: 66..68, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Some( Identifier { id: Name("y"), range: 67..68, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -149,11 +149,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..74, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..74, }, ), @@ -163,22 +163,22 @@ Module( }, MatchCase { range: 96..115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 101..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 102..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 102..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -186,13 +186,13 @@ Module( MatchAs( PatternMatchAs { range: 105..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 105..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -200,13 +200,13 @@ Module( MatchAs( PatternMatchAs { range: 108..109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 108..109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -218,11 +218,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..115, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..115, }, ), @@ -232,15 +232,15 @@ Module( }, MatchCase { range: 146..168, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 151..163, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..153, value: Int( 1, @@ -249,7 +249,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..159, value: Int( 2, @@ -261,13 +261,13 @@ Module( MatchAs( PatternMatchAs { range: 155..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 155..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -275,13 +275,13 @@ Module( MatchAs( PatternMatchAs { range: 161..162, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 161..162, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -294,11 +294,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..168, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..168, }, ), @@ -308,15 +308,15 @@ Module( }, MatchCase { range: 207..228, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 212..223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..214, value: Int( 1, @@ -328,13 +328,13 @@ Module( MatchAs( PatternMatchAs { range: 216..217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 216..217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -344,7 +344,7 @@ Module( Identifier { id: Name("x"), range: 221..222, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -353,11 +353,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..228, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..228, }, ), @@ -367,14 +367,14 @@ Module( }, MatchCase { range: 269..290, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 274..285, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..279, id: Name("Class"), ctx: Load, @@ -382,18 +382,18 @@ Module( ), arguments: PatternArguments { range: 279..285, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 280..281, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 280..281, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -401,13 +401,13 @@ Module( MatchAs( PatternMatchAs { range: 283..284, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 283..284, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -421,11 +421,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 287..290, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 287..290, }, ), @@ -435,14 +435,14 @@ Module( }, MatchCase { range: 320..345, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 325..340, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 325..330, id: Name("Class"), ctx: Load, @@ -450,27 +450,27 @@ Module( ), arguments: PatternArguments { range: 330..340, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 331..334, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("y"), range: 331..332, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchAs( PatternMatchAs { range: 333..334, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 333..334, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -478,22 +478,22 @@ Module( }, PatternKeyword { range: 336..339, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("z"), range: 336..337, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchAs( PatternMatchAs { range: 338..339, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 338..339, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -507,11 +507,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 342..345, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 342..345, }, ), @@ -521,27 +521,27 @@ Module( }, MatchCase { range: 372..412, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 377..407, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchSequence( PatternMatchSequence { range: 377..380, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 378..379, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 378..379, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -552,11 +552,11 @@ Module( MatchMapping( PatternMatchMapping { range: 383..389, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 384..385, value: Int( 1, @@ -568,13 +568,13 @@ Module( MatchAs( PatternMatchAs { range: 387..388, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 387..388, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -586,10 +586,10 @@ Module( MatchClass( PatternMatchClass { range: 392..407, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 392..397, id: Name("Class"), ctx: Load, @@ -597,27 +597,27 @@ Module( ), arguments: PatternArguments { range: 397..407, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 398..401, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("y"), range: 398..399, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchAs( PatternMatchAs { range: 400..401, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 400..401, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -625,22 +625,22 @@ Module( }, PatternKeyword { range: 403..406, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("z"), range: 403..404, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchAs( PatternMatchAs { range: 405..406, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 405..406, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -657,11 +657,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 409..412, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 409..412, }, ), @@ -671,22 +671,22 @@ Module( }, MatchCase { range: 428..444, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 433..439, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchAs( PatternMatchAs { range: 433..434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 433..434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -696,7 +696,7 @@ Module( Identifier { id: Name("x"), range: 438..439, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -705,11 +705,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 441..444, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 441..444, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap index e7bbeb557a..0fb6c83f46 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/multiple_clauses_on_s ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..258, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..41, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, value: true, }, @@ -24,7 +24,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -32,11 +32,11 @@ Module( elif_else_clauses: [ ElifElseClause { range: 14..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..24, value: false, }, @@ -45,7 +45,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..30, }, ), @@ -53,12 +53,12 @@ Module( }, ElifElseClause { range: 31..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..41, }, ), @@ -69,11 +69,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..85, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..49, value: true, }, @@ -81,7 +81,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..55, }, ), @@ -89,11 +89,11 @@ Module( elif_else_clauses: [ ElifElseClause { range: 57..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..67, value: false, }, @@ -102,7 +102,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..73, }, ), @@ -110,12 +110,12 @@ Module( }, ElifElseClause { range: 75..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..85, }, ), @@ -126,12 +126,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..117, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("x"), ctx: Store, @@ -139,7 +139,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..99, id: Name("iter"), ctx: Load, @@ -148,7 +148,7 @@ Module( body: [ Break( StmtBreak { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..106, }, ), @@ -156,7 +156,7 @@ Module( orelse: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..117, }, ), @@ -165,12 +165,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..150, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, id: Name("x"), ctx: Store, @@ -178,7 +178,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..131, id: Name("iter"), ctx: Load, @@ -187,7 +187,7 @@ Module( body: [ Break( StmtBreak { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..138, }, ), @@ -195,7 +195,7 @@ Module( orelse: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..150, }, ), @@ -204,12 +204,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..202, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..160, }, ), @@ -218,11 +218,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 161..177, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..171, id: Name("exc"), ctx: Load, @@ -233,7 +233,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 173..177, }, ), @@ -244,7 +244,7 @@ Module( orelse: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 184..188, }, ), @@ -252,7 +252,7 @@ Module( finalbody: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 198..202, }, ), @@ -262,12 +262,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 203..257, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..212, }, ), @@ -276,11 +276,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 214..230, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..224, id: Name("exc"), ctx: Load, @@ -291,7 +291,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..230, }, ), @@ -302,7 +302,7 @@ Module( orelse: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..242, }, ), @@ -310,7 +310,7 @@ Module( finalbody: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..257, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap index 0e70f2a74a..d521c935f4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/named_expr_slice.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..119, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..92, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..92, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..83, id: Name("lst"), ctx: Load, @@ -28,16 +28,16 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..91, lower: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..88, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..85, id: Name("x"), ctx: Store, @@ -45,7 +45,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..88, value: Int( 1, @@ -58,12 +58,12 @@ Module( upper: Some( UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..91, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, value: Int( 1, @@ -83,15 +83,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..100, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..100, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..96, id: Name("lst"), ctx: Load, @@ -99,12 +99,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..100, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, value: Int( 1, @@ -115,7 +115,7 @@ Module( upper: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, id: Name("x"), ctx: Load, @@ -132,11 +132,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, value: Int( 1, @@ -147,15 +147,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..114, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..114, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..108, id: Name("lst"), ctx: Load, @@ -163,12 +163,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..114, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..110, value: Int( 1, @@ -179,7 +179,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..112, value: Int( 3, @@ -190,7 +190,7 @@ Module( step: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..114, id: Name("x"), ctx: Load, @@ -206,11 +206,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..117, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..117, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap index 044df9bbb7..e282dc0cab 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/named_expr_slice_pars ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..130, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..129, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..129, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..120, id: Name("lst"), ctx: Load, @@ -28,16 +28,16 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..128, lower: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..125, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..122, id: Name("x"), ctx: Store, @@ -45,7 +45,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..125, value: Int( 1, @@ -58,12 +58,12 @@ Module( upper: Some( UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..128, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap index 9d6245421f..310c7d5336 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/nested_async_comprehe ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..467, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..111, is_async: true, decorator_list: [], name: Identifier { id: Name("f"), range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 55..57, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,20 +35,20 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..111, value: Some( ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..111, elt: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..92, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Load, @@ -59,10 +57,10 @@ Module( generators: [ Comprehension { range: 70..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..81, id: Name("x"), ctx: Store, @@ -70,11 +68,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..91, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, id: Name("foo"), ctx: Load, @@ -82,11 +80,11 @@ Module( ), arguments: Arguments { range: 88..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, id: Name("n"), ctx: Load, @@ -106,10 +104,10 @@ Module( generators: [ Comprehension { range: 93..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, id: Name("n"), ctx: Store, @@ -117,11 +115,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..110, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..107, id: Name("range"), ctx: Load, @@ -129,11 +127,11 @@ Module( ), arguments: Arguments { range: 107..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, value: Int( 3, @@ -159,21 +157,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..192, is_async: true, decorator_list: [], name: Identifier { id: Name("g"), range: 132..133, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 133..135, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -184,20 +180,20 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..192, value: Some( ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..192, elt: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..173, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, id: Name("x"), ctx: Load, @@ -205,7 +201,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..150, value: Int( 1, @@ -215,10 +211,10 @@ Module( generators: [ Comprehension { range: 151..172, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 161..162, id: Name("x"), ctx: Store, @@ -226,11 +222,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..172, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..169, id: Name("foo"), ctx: Load, @@ -238,11 +234,11 @@ Module( ), arguments: Arguments { range: 169..172, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..171, id: Name("n"), ctx: Load, @@ -262,10 +258,10 @@ Module( generators: [ Comprehension { range: 174..191, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..179, id: Name("n"), ctx: Store, @@ -273,11 +269,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..191, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..188, id: Name("range"), ctx: Load, @@ -285,11 +281,11 @@ Module( ), arguments: Arguments { range: 188..191, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, value: Int( 3, @@ -315,21 +311,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..267, is_async: true, decorator_list: [], name: Identifier { id: Name("h"), range: 210..211, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 211..213, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -340,20 +334,20 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..267, value: Some( ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..267, elt: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..248, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..225, id: Name("x"), ctx: Load, @@ -362,10 +356,10 @@ Module( generators: [ Comprehension { range: 226..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..237, id: Name("x"), ctx: Store, @@ -373,11 +367,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..247, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..244, id: Name("foo"), ctx: Load, @@ -385,11 +379,11 @@ Module( ), arguments: Arguments { range: 244..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..246, id: Name("n"), ctx: Load, @@ -409,10 +403,10 @@ Module( generators: [ Comprehension { range: 249..266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..254, id: Name("n"), ctx: Store, @@ -420,11 +414,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..266, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..263, id: Name("range"), ctx: Load, @@ -432,11 +426,11 @@ Module( ), arguments: Arguments { range: 263..266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..265, value: Int( 3, @@ -462,21 +456,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 277..371, is_async: true, decorator_list: [], name: Identifier { id: Name("i"), range: 287..288, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 288..290, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -487,25 +479,25 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 292..371, value: Some( ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 299..371, elt: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..352, elts: [ ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..328, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 302..303, id: Name("y"), ctx: Load, @@ -514,10 +506,10 @@ Module( generators: [ Comprehension { range: 304..327, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 314..315, id: Name("y"), ctx: Store, @@ -525,11 +517,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..327, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..324, id: Name("range"), ctx: Load, @@ -537,11 +529,11 @@ Module( ), arguments: Arguments { range: 324..327, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 325..326, value: Int( 1, @@ -561,11 +553,11 @@ Module( ), ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 330..351, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..332, id: Name("z"), ctx: Load, @@ -574,10 +566,10 @@ Module( generators: [ Comprehension { range: 333..350, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 337..338, id: Name("z"), ctx: Store, @@ -585,11 +577,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 342..350, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 342..347, id: Name("range"), ctx: Load, @@ -597,11 +589,11 @@ Module( ), arguments: Arguments { range: 347..350, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..349, value: Int( 2, @@ -627,10 +619,10 @@ Module( generators: [ Comprehension { range: 353..370, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 357..358, id: Name("x"), ctx: Store, @@ -638,11 +630,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 362..370, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 362..367, id: Name("range"), ctx: Load, @@ -650,11 +642,11 @@ Module( ), arguments: Arguments { range: 367..370, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 368..369, value: Int( 5, @@ -680,21 +672,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 372..466, is_async: true, decorator_list: [], name: Identifier { id: Name("j"), range: 382..383, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 383..385, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -705,25 +695,25 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 387..466, value: Some( ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 394..466, elt: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 395..447, elts: [ ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 396..417, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 397..398, id: Name("y"), ctx: Load, @@ -732,10 +722,10 @@ Module( generators: [ Comprehension { range: 399..416, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..404, id: Name("y"), ctx: Store, @@ -743,11 +733,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 408..416, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 408..413, id: Name("range"), ctx: Load, @@ -755,11 +745,11 @@ Module( ), arguments: Arguments { range: 413..416, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 414..415, value: Int( 1, @@ -779,11 +769,11 @@ Module( ), ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 419..446, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 420..421, id: Name("z"), ctx: Load, @@ -792,10 +782,10 @@ Module( generators: [ Comprehension { range: 422..445, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 432..433, id: Name("z"), ctx: Store, @@ -803,11 +793,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 437..445, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 437..442, id: Name("range"), ctx: Load, @@ -815,11 +805,11 @@ Module( ), arguments: Arguments { range: 442..445, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 443..444, value: Int( 2, @@ -845,10 +835,10 @@ Module( generators: [ Comprehension { range: 448..465, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 452..453, id: Name("x"), ctx: Store, @@ -856,11 +846,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 457..465, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 457..462, id: Name("range"), ctx: Load, @@ -868,11 +858,11 @@ Module( ), arguments: Arguments { range: 462..465, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 463..464, value: Int( 5, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap index 95c44e302d..c3a8cdca25 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/node_range_with_gaps. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..41, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..7, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -39,21 +37,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..32, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 22..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 25..27, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -64,11 +60,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, }, ), @@ -79,21 +75,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..40, is_async: false, decorator_list: [], name: Identifier { id: Name("baz"), range: 37..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 40..40, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap index d49417620b..ecfbbe06d2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap @@ -7,36 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/nonlocal_declaration_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..25, body: [ Nonlocal( StmtNonlocal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, names: [ Identifier { id: Name("x"), range: 9..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, ), Nonlocal( StmtNonlocal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..24, names: [ Identifier { id: Name("x"), range: 20..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, Identifier { id: Name("y"), range: 23..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap index dde2775dc3..e7c4c552bd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/nonlocal_stmt_empty.p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..21, is_async: false, decorator_list: [], name: Identifier { id: Name("_"), range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 5..7, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,7 +35,7 @@ Module( body: [ Nonlocal( StmtNonlocal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..21, names: [], }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap index 739b49643a..f82316bd46 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/nonlocal_stmt_express ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..27, is_async: false, decorator_list: [], name: Identifier { id: Name("_"), range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 5..7, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,29 +35,29 @@ Module( body: [ Nonlocal( StmtNonlocal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..23, names: [ Identifier { id: Name("x"), range: 22..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, op: UAdd, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap index 10cedaf7ba..d749245b98 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/nonlocal_stmt_trailin ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..59, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..58, is_async: false, decorator_list: [], name: Identifier { id: Name("_"), range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 5..7, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,38 +35,38 @@ Module( body: [ Nonlocal( StmtNonlocal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..23, names: [], }, ), Nonlocal( StmtNonlocal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..39, names: [ Identifier { id: Name("x"), range: 37..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, ), Nonlocal( StmtNonlocal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..58, names: [ Identifier { id: Name("x"), range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, Identifier { id: Name("y"), range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap index f23ebd2f93..16efd0233e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap @@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_missing_annotat ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..35, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..11, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -53,11 +51,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, }, ), @@ -68,33 +66,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..34, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 21..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 24..29, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 25..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 25..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 25..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -109,11 +105,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap index ee03c9a0a6..fcb763f0a1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap @@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_missing_default ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..41, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..11, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -53,11 +51,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, }, ), @@ -68,38 +66,36 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..40, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 21..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 24..35, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 25..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 25..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 25..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..31, id: Name("int"), ctx: Load, @@ -118,11 +114,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..40, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..40, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap index 779f868a44..149cc7b4ce 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap @@ -7,47 +7,45 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_with_invalid_an ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..81, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..23, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..18, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 8..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..17, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("int"), ctx: Load, @@ -69,11 +67,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, }, ), @@ -84,43 +82,41 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..52, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 28..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 31..47, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 32..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 32..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 32..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..46, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..46, id: Name("int"), ctx: Load, @@ -142,11 +138,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, }, ), @@ -157,38 +153,36 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..80, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 57..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 60..75, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 61..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 61..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 61..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, id: Name("x"), ctx: Load, @@ -200,14 +194,14 @@ Module( }, ParameterWithDefault { range: 71..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 71..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("int"), range: 71..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -222,11 +216,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..80, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..80, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap index bec69b1894..fcc9686845 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap @@ -7,49 +7,47 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_with_invalid_de ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..68, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..15, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..14, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..14, id: Name("int"), ctx: Load, @@ -69,11 +67,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, }, ), @@ -84,44 +82,42 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..43, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 25..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 28..38, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 29..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..36, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..36, id: Name("int"), ctx: Load, @@ -141,11 +137,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..43, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..43, }, ), @@ -156,45 +152,43 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..67, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 48..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 51..62, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 52..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..61, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("y"), ctx: Load, @@ -214,11 +208,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..67, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..67, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap index 9360cfde29..c8ace07b1f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap @@ -7,45 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_with_invalid_st ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..150, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..17, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 8..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 9..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..16, id: Name(""), ctx: Invalid, @@ -64,11 +62,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, }, ), @@ -79,44 +77,42 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..57, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 27..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 30..52, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 31..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 32..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..50, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..50, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..45, id: Name("tuple"), ctx: Load, @@ -124,7 +120,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..49, id: Name("int"), ctx: Load, @@ -146,11 +142,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..57, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..57, }, ), @@ -161,46 +157,44 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..90, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 62..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 65..85, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 66..84, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 67..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..84, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..84, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..77, id: Name("int"), ctx: Load, @@ -208,7 +202,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, id: Name("str"), ctx: Load, @@ -230,11 +224,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..90, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..90, }, ), @@ -245,45 +239,43 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..120, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 95..98, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 98..115, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 99..114, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 100..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..114, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..114, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..114, id: Name("x"), ctx: Load, @@ -305,11 +297,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..120, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..120, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap index 224824a9e7..0add20fe0e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap @@ -7,45 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/err/param_with_star_annot ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..69, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..68, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 48..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 51..63, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 52..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 53..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..62, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..62, id: Name("Ts"), ctx: Load, @@ -64,11 +62,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..68, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..68, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap index 9e0f94fdad..54ade04fb2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap @@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_duplicate_name ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..42, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..41, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..36, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -46,21 +44,21 @@ Module( }, ParameterWithDefault { range: 11..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..15, value: Int( 10, @@ -73,11 +71,11 @@ Module( vararg: Some( Parameter { range: 17..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -85,14 +83,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -100,19 +98,19 @@ Module( }, ParameterWithDefault { range: 24..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 24..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..30, id: Name("str"), ctx: Load, @@ -126,11 +124,11 @@ Module( kwarg: Some( Parameter { range: 32..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 34..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -140,11 +138,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..41, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..41, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap index c2fdb7f4d5..b1d8bdaa92 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_expected_after ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..98, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..10, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,11 +35,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, }, ), @@ -52,21 +50,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..32, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 20..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 23..27, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -77,11 +73,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, }, ), @@ -92,33 +88,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..51, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 37..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 40..46, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 41..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 41..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 41..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -133,11 +127,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..51, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..51, }, ), @@ -148,33 +142,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..71, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 56..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 59..66, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 60..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -189,11 +181,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..71, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..71, }, ), @@ -204,21 +196,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..97, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 76..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 79..92, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -226,11 +216,11 @@ Module( kwarg: Some( Parameter { range: 83..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 85..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -240,11 +230,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..97, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..97, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap index 71846f8fc7..324b7246ea 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_kwarg_after_st ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..25, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..20, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -34,11 +32,11 @@ Module( kwarg: Some( Parameter { range: 11..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 13..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -48,11 +46,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap index f26f826c50..156a962746 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap @@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_multiple_kwarg ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..37, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..32, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -50,11 +48,11 @@ Module( kwarg: Some( Parameter { range: 22..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs2"), range: 24..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -64,11 +62,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..37, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..37, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap index 5bbcc79890..21a9f28820 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap @@ -7,37 +7,35 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_multiple_slash ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..53, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..19, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -47,14 +45,14 @@ Module( args: [ ParameterWithDefault { range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -69,11 +67,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, }, ), @@ -84,32 +82,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..52, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 29..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 32..47, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -119,14 +115,14 @@ Module( args: [ ParameterWithDefault { range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -134,14 +130,14 @@ Module( }, ParameterWithDefault { range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -156,11 +152,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap index 9e2ccfb2c9..4daa7f27f2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap @@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_multiple_star_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..53, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..19, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -49,14 +47,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -69,11 +67,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, }, ), @@ -84,33 +82,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..52, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 29..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 32..47, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -121,14 +117,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -136,14 +132,14 @@ Module( }, ParameterWithDefault { range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -156,11 +152,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap index a8a26d73bc..8fb783b1c1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap @@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_multiple_varar ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..136, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..23, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -48,11 +46,11 @@ Module( vararg: Some( Parameter { range: 14..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 15..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -60,14 +58,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -80,11 +78,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, }, ), @@ -95,33 +93,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..97, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 67..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 70..92, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 71..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 71..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 71..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -131,11 +127,11 @@ Module( vararg: Some( Parameter { range: 74..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args1"), range: 75..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -143,14 +139,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 90..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 90..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 90..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -163,11 +159,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..97, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..97, }, ), @@ -178,33 +174,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..135, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 102..105, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 105..130, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 106..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 106..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 106..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -214,11 +208,11 @@ Module( vararg: Some( Parameter { range: 109..115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args1"), range: 110..115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -226,14 +220,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 117..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 117..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 117..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -241,14 +235,14 @@ Module( }, ParameterWithDefault { range: 120..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 120..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 120..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -261,11 +255,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..135, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..135, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap index be7f6b1b35..7444c8148a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_no_arg_before_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..35, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..10, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,11 +35,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, }, ), @@ -52,33 +50,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..34, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 20..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 23..29, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 27..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 27..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 27..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -93,11 +89,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap index 4e01047ebb..4d23c7dde9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap @@ -7,45 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_non_default_af ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..30, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..29, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..24, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..12, value: Int( 10, @@ -56,14 +54,14 @@ Module( }, ParameterWithDefault { range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -71,19 +69,19 @@ Module( }, ParameterWithDefault { range: 17..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 17..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, id: Name("int"), ctx: Load, @@ -102,11 +100,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap index c2db1084e7..2015f10090 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap @@ -7,36 +7,34 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_star_after_sla ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..105, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..14, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 9..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -48,11 +46,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..19, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..19, }, ), @@ -63,32 +61,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..48, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 24..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 27..43, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 28..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 28..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 28..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -99,11 +95,11 @@ Module( vararg: Some( Parameter { range: 31..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 32..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -111,14 +107,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 38..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 38..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 38..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -131,11 +127,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..48, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..48, }, ), @@ -146,32 +142,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..73, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 53..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 56..68, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 57..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 57..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 57..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -183,14 +177,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 66..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 66..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 66..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -203,11 +197,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..73, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..73, }, ), @@ -218,32 +212,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..104, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 78..81, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 81..99, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 82..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 82..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 82..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -255,14 +247,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 88..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 88..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 88..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -270,14 +262,14 @@ Module( }, ParameterWithDefault { range: 91..92, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 91..92, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 91..92, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -285,14 +277,14 @@ Module( }, ParameterWithDefault { range: 97..98, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 97..98, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 97..98, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -305,11 +297,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..104, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..104, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap index aa5149155a..fb13bd6095 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap @@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_star_separator ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..61, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..23, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -48,11 +46,11 @@ Module( vararg: Some( Parameter { range: 11..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 12..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -60,14 +58,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -80,11 +78,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, }, ), @@ -95,33 +93,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..60, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 33..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 36..55, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 37..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 37..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 37..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -131,11 +127,11 @@ Module( vararg: Some( Parameter { range: 40..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 41..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -143,14 +139,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 47..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 47..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 47..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -158,14 +154,14 @@ Module( }, ParameterWithDefault { range: 50..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 50..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 50..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -178,11 +174,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap index f56f7d96ab..85f48fc80f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap @@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_var_keyword_wi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..43, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..36, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..20, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -50,11 +48,11 @@ Module( kwarg: Some( Parameter { range: 11..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 13..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -64,24 +62,24 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..36, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..36, items: [ DictItem { key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, value: StringLiteralValue { inner: Single( StringLiteral { range: 21..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "b", flags: StringLiteralFlags { quote_style: Single, @@ -96,7 +94,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, value: Int( 1, @@ -108,13 +106,13 @@ Module( key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, value: StringLiteralValue { inner: Single( StringLiteral { range: 29..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "c", flags: StringLiteralFlags { quote_style: Single, @@ -129,7 +127,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, value: Int( 2, @@ -147,11 +145,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap index 5ca631e7d1..1e84abfa40 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap @@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/err/params_var_positional ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..30, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..23, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..17, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -48,11 +46,11 @@ Module( vararg: Some( Parameter { range: 11..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 12..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -64,16 +62,16 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..23, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..23, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, value: Int( 1, @@ -82,7 +80,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, value: Int( 2, @@ -101,11 +99,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap index ca32f57b18..c9fce5f081 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/parenthesized_context ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..126, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..73, is_async: false, items: [ WithItem { range: 49..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, id: Name("foo"), ctx: Load, @@ -30,7 +30,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("x"), ctx: Store, @@ -40,10 +40,10 @@ Module( }, WithItem { range: 59..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..62, id: Name("bar"), ctx: Load, @@ -52,7 +52,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, id: Name("y"), ctx: Store, @@ -64,11 +64,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..73, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..73, }, ), @@ -79,16 +79,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..99, is_async: false, items: [ WithItem { range: 80..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..83, id: Name("foo"), ctx: Load, @@ -98,10 +98,10 @@ Module( }, WithItem { range: 85..93, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, id: Name("bar"), ctx: Load, @@ -110,7 +110,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..93, id: Name("y"), ctx: Store, @@ -122,11 +122,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, }, ), @@ -137,16 +137,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..125, is_async: false, items: [ WithItem { range: 106..114, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..109, id: Name("foo"), ctx: Load, @@ -155,7 +155,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..114, id: Name("x"), ctx: Store, @@ -165,10 +165,10 @@ Module( }, WithItem { range: 116..119, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..119, id: Name("bar"), ctx: Load, @@ -180,11 +180,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..125, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..125, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap index 90fb2c97da..149fba6e35 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/parenthesized_kwarg_p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..77, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..51, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..51, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, id: Name("f"), ctx: Load, @@ -28,22 +28,22 @@ Module( ), arguments: Arguments { range: 44..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 45..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("a"), range: 46..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, value: Int( 1, @@ -59,15 +59,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..62, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..62, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, id: Name("f"), ctx: Load, @@ -75,22 +75,22 @@ Module( ), arguments: Arguments { range: 53..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 54..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("a"), range: 55..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, value: Int( 1, @@ -106,15 +106,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..76, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..76, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, id: Name("f"), ctx: Load, @@ -122,22 +122,22 @@ Module( ), arguments: Arguments { range: 64..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 66..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("a"), range: 68..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap index 78be042c66..0361caff9b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap @@ -7,42 +7,42 @@ input_file: crates/ruff_python_parser/resources/inline/err/pep701_f_string_py311 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..549, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..74, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..74, value: FStringValue { inner: Single( FString( FString { range: 44..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 46..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Magic wand: ", }, ), Interpolation( InterpolatedElement { range: 58..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..71, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, id: Name("bag"), ctx: Load, @@ -50,13 +50,13 @@ Module( ), slice: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..70, value: StringLiteralValue { inner: Single( StringLiteral { range: 64..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "wand", flags: StringLiteralFlags { quote_style: Single, @@ -92,40 +92,40 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..112, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..112, value: FStringValue { inner: Single( FString( FString { range: 95..112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 97..111, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..110, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..107, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..102, value: StringLiteralValue { inner: Single( StringLiteral { range: 98..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\n", flags: StringLiteralFlags { quote_style: Single, @@ -140,18 +140,18 @@ Module( attr: Identifier { id: Name("join"), range: 103..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 107..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, id: Name("a"), ctx: Load, @@ -183,37 +183,37 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..220, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..220, value: FStringValue { inner: Single( FString( FString { range: 148..220, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 152..169, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "A complex trick: ", }, ), Interpolation( InterpolatedElement { range: 169..217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..185, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..178, id: Name("bag"), ctx: Load, @@ -221,13 +221,13 @@ Module( ), slice: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..184, value: StringLiteralValue { inner: Single( StringLiteral { range: 179..184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "bag", flags: StringLiteralFlags { quote_style: Single, @@ -263,105 +263,105 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..254, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..254, value: FStringValue { inner: Single( FString( FString { range: 221..254, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 223..253, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..252, value: FStringValue { inner: Single( FString( FString { range: 224..252, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 226..251, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..250, value: FStringValue { inner: Single( FString( FString { range: 227..250, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 229..249, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..248, value: FStringValue { inner: Single( FString( FString { range: 230..248, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 232..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..246, value: FStringValue { inner: Single( FString( FString { range: 233..246, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 235..245, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..244, value: FStringValue { inner: Single( FString( FString { range: 236..244, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 238..243, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..242, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..240, value: Int( 1, @@ -371,7 +371,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..242, value: Int( 1, @@ -486,47 +486,47 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 276..310, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 276..310, value: FStringValue { inner: Single( FString( FString { range: 276..310, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 278..303, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 279..302, value: FStringValue { inner: Single( FString( FString { range: 279..302, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 283..293, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 284..292, value: StringLiteralValue { inner: Single( StringLiteral { range: 284..292, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "nested", flags: StringLiteralFlags { quote_style: Double, @@ -546,7 +546,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 293..299, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " inner", }, ), @@ -570,7 +570,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 303..309, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " outer", }, ), @@ -590,33 +590,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..359, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..359, value: FStringValue { inner: Single( FString( FString { range: 336..359, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 338..343, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "test ", }, ), Interpolation( InterpolatedElement { range: 343..353, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..345, id: Name("a"), ctx: Load, @@ -630,7 +630,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 353..358, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " more", }, ), @@ -650,41 +650,41 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..422, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..422, value: FStringValue { inner: Single( FString( FString { range: 403..422, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 407..419, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 408..418, value: FStringValue { inner: Single( FString( FString { range: 408..418, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 412..415, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 413..414, id: Name("x"), ctx: Load, @@ -728,40 +728,40 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 468..502, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 468..502, value: FStringValue { inner: Single( FString( FString { range: 468..502, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 470..501, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 471..500, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 471..480, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 471..475, value: StringLiteralValue { inner: Single( StringLiteral { range: 471..475, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\n", flags: StringLiteralFlags { quote_style: Single, @@ -776,29 +776,29 @@ Module( attr: Identifier { id: Name("join"), range: 476..480, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 480..500, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 481..499, elts: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 482..486, value: StringLiteralValue { inner: Single( StringLiteral { range: 482..486, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\t", flags: StringLiteralFlags { quote_style: Single, @@ -812,13 +812,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 488..492, value: StringLiteralValue { inner: Single( StringLiteral { range: 488..492, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\u{b}", flags: StringLiteralFlags { quote_style: Single, @@ -832,13 +832,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 494..498, value: StringLiteralValue { inner: Single( StringLiteral { range: 494..498, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\r", flags: StringLiteralFlags { quote_style: Single, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap index 6e1bdfaf6e..f6650bb5d9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap @@ -7,37 +7,35 @@ input_file: crates/ruff_python_parser/resources/inline/err/pos_only_py37.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..136, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..61, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 47..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 50..56, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 51..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 51..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 51..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -53,11 +51,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, }, ), @@ -68,32 +66,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..86, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 66..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 69..81, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 70..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 70..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 70..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -103,14 +99,14 @@ Module( args: [ ParameterWithDefault { range: 76..77, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 76..77, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 76..77, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -125,11 +121,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..86, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..86, }, ), @@ -140,32 +136,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..115, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 91..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 94..110, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 95..96, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 95..96, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 95..96, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -176,11 +170,11 @@ Module( vararg: Some( Parameter { range: 98..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 99..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -188,14 +182,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 108..109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 108..109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 108..109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -208,11 +202,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..115, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..115, }, ), @@ -223,33 +217,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..135, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 120..123, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 123..130, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 124..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 124..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 124..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -264,11 +256,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..135, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..135, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap index d6a06bfe2f..4e9bad06a4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap @@ -7,18 +7,18 @@ input_file: crates/ruff_python_parser/resources/inline/err/raise_stmt_from_witho ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..31, body: [ Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, exc: None, cause: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..14, id: Name("exc"), ctx: Load, @@ -29,13 +29,13 @@ Module( ), Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..30, exc: None, cause: Some( NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..30, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap index 969eb0b526..c9559c557f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/raise_stmt_invalid_ca ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..57, body: [ Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, exc: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -27,11 +27,11 @@ Module( cause: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..15, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("y"), ctx: Load, @@ -45,12 +45,12 @@ Module( ), Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..36, exc: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("x"), ctx: Load, @@ -60,12 +60,12 @@ Module( cause: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..36, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("y"), ctx: Load, @@ -79,12 +79,12 @@ Module( ), Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..51, exc: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, id: Name("x"), ctx: Load, @@ -94,7 +94,7 @@ Module( cause: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..51, id: Name("y"), ctx: Load, @@ -105,11 +105,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap index fc1d86ea86..6886f22bad 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/raise_stmt_invalid_ex ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..36, body: [ Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, exc: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..8, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("x"), ctx: Load, @@ -36,17 +36,17 @@ Module( ), Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..22, exc: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..22, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, id: Name("x"), ctx: Load, @@ -61,12 +61,12 @@ Module( ), Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..30, exc: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("x"), ctx: Load, @@ -78,11 +78,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap index d25483b1bc..40dc442afd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/raise_stmt_unparenthe ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..34, body: [ Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, exc: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -27,12 +27,12 @@ Module( cause: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..15, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("y"), ctx: Load, @@ -48,12 +48,12 @@ Module( ), Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..33, exc: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("x"), ctx: Load, @@ -63,12 +63,12 @@ Module( cause: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..33, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("y"), ctx: Load, @@ -76,7 +76,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, id: Name("z"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap index 36f4db810c..34510782dc 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/inline/err/raise_stmt_unparenthe ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..38, body: [ Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, exc: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..8, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -39,17 +39,17 @@ Module( ), Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..19, exc: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..19, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, id: Name("x"), ctx: Load, @@ -57,7 +57,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("y"), ctx: Load, @@ -74,17 +74,17 @@ Module( ), Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..37, exc: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..30, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("x"), ctx: Load, @@ -92,7 +92,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("y"), ctx: Load, @@ -107,7 +107,7 @@ Module( cause: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, id: Name("z"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap index aec52e3b45..5864cb2b05 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lex_logical_token.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..979, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..59, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..59, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..55, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 55..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..59, id: Name("foo"), ctx: Load, @@ -49,21 +49,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..79, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 64..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 67..69, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -74,7 +72,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..79, }, ), @@ -83,15 +81,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..152, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..124, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..120, id: Name("call"), ctx: Load, @@ -99,11 +97,11 @@ Module( ), arguments: Arguments { range: 120..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..124, id: Name("foo"), ctx: Load, @@ -117,21 +115,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..152, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 133..136, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 136..138, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -142,7 +138,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..152, }, ), @@ -155,15 +151,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..269, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..239, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..235, id: Name("call"), ctx: Load, @@ -171,11 +167,11 @@ Module( ), arguments: Arguments { range: 235..239, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..239, id: Name("foo"), ctx: Load, @@ -189,21 +185,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..269, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 250..253, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 253..255, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -214,7 +208,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..269, }, ), @@ -227,15 +221,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..392, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 347..355, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 347..351, id: Name("call"), ctx: Load, @@ -243,11 +237,11 @@ Module( ), arguments: Arguments { range: 351..355, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 352..355, id: Name("foo"), ctx: Load, @@ -261,21 +255,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 369..392, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 373..376, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 376..378, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -286,7 +278,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 388..392, }, ), @@ -299,15 +291,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 453..499, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 456..472, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 456..460, id: Name("call"), ctx: Load, @@ -315,11 +307,11 @@ Module( ), arguments: Arguments { range: 460..472, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 461..464, id: Name("foo"), ctx: Load, @@ -327,12 +319,12 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 466..471, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 467..468, id: Name("a"), ctx: Load, @@ -340,7 +332,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 470..471, id: Name("b"), ctx: Load, @@ -358,21 +350,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 476..499, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 480..483, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 483..485, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -383,7 +373,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 495..499, }, ), @@ -396,15 +386,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 564..611, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 567..583, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 567..571, id: Name("call"), ctx: Load, @@ -412,11 +402,11 @@ Module( ), arguments: Arguments { range: 571..583, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 572..575, id: Name("foo"), ctx: Load, @@ -424,12 +414,12 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 577..582, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 578..579, id: Name("a"), ctx: Load, @@ -437,7 +427,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 581..582, id: Name("b"), ctx: Load, @@ -455,21 +445,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 588..611, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 592..595, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 595..597, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -480,7 +468,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 607..611, }, ), @@ -493,15 +481,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 772..824, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 775..796, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 775..779, id: Name("call"), ctx: Load, @@ -509,11 +497,11 @@ Module( ), arguments: Arguments { range: 779..796, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 780..783, id: Name("foo"), ctx: Load, @@ -521,12 +509,12 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 785..794, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 786..787, id: Name("a"), ctx: Load, @@ -534,7 +522,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 793..794, id: Name("b"), ctx: Load, @@ -552,21 +540,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 801..824, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 805..808, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 808..810, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -577,7 +563,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 820..824, }, ), @@ -590,15 +576,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 887..933, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 890..905, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 890..894, id: Name("call"), ctx: Load, @@ -606,33 +592,33 @@ Module( ), arguments: Arguments { range: 894..905, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 895..905, value: FStringValue { inner: Single( FString( FString { range: 895..905, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 897..903, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello ", }, ), Interpolation( InterpolatedElement { range: 903..905, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 904..905, id: Name("x"), ctx: Load, @@ -663,21 +649,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 910..933, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 914..917, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 917..919, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -688,7 +672,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 929..933, }, ), @@ -701,15 +685,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 936..956, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 939..956, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 939..943, id: Name("call"), ctx: Load, @@ -717,18 +701,18 @@ Module( ), arguments: Arguments { range: 943..956, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 944..951, value: FStringValue { inner: Single( FString( FString { range: 944..951, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: FStringFlags { quote_style: Double, @@ -752,21 +736,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 956..979, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 960..963, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 963..965, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -777,7 +759,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 975..979, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap index 065645a7ac..d9082066b8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lex_logical_token_mac ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..46, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..46, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..19, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 7..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..11, id: Name("foo"), ctx: Load, @@ -40,12 +40,12 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..18, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("a"), ctx: Load, @@ -53,7 +53,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("b"), ctx: Load, @@ -71,21 +71,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..46, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 27..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 30..32, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -96,7 +94,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..46, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap index 37943705bb..c3b23f4fbd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lex_logical_token_win ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..50, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..48, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..20, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 7..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..11, id: Name("foo"), ctx: Load, @@ -40,12 +40,12 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..18, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("a"), ctx: Load, @@ -53,7 +53,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("b"), ctx: Load, @@ -71,21 +71,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..48, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 28..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 31..33, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -96,7 +94,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..48, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap index 4cb5587c2a..b14f005e9c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap @@ -7,44 +7,44 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/fstring_format ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..298, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..192, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..192, value: FStringValue { inner: Single( FString( FString { range: 162..192, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 164..171, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "middle ", }, ), Interpolation( InterpolatedElement { range: 171..191, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..180, value: StringLiteralValue { inner: Single( StringLiteral { range: 172..180, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "string", flags: StringLiteralFlags { quote_style: Single, @@ -61,12 +61,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 181..191, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 181..191, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " ", }, ), @@ -91,11 +91,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..198, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..198, id: Name("format"), ctx: Load, @@ -105,11 +105,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..203, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..203, id: Name("spec"), ctx: Load, @@ -119,39 +119,39 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..228, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..228, value: FStringValue { inner: Single( FString( FString { range: 207..228, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 209..216, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "middle ", }, ), Interpolation( InterpolatedElement { range: 216..228, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..225, value: StringLiteralValue { inner: Single( StringLiteral { range: 217..225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "string", flags: StringLiteralFlags { quote_style: Single, @@ -168,7 +168,7 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 226..228, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], }, ), @@ -190,17 +190,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 237..250, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 237..250, value: StringLiteralValue { inner: Single( StringLiteral { range: 237..250, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "format spec", flags: StringLiteralFlags { quote_style: Single, @@ -216,39 +216,39 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..285, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..285, value: FStringValue { inner: Single( FString( FString { range: 253..285, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 255..262, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "middle ", }, ), Interpolation( InterpolatedElement { range: 262..284, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 263..271, value: StringLiteralValue { inner: Single( StringLiteral { range: 263..271, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "string", flags: StringLiteralFlags { quote_style: Single, @@ -265,12 +265,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 272..284, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 272..284, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\ ", }, ), @@ -295,11 +295,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 285..291, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 285..291, id: Name("format"), ctx: Load, @@ -309,11 +309,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 292..296, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 292..296, id: Name("spec"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap index ae9e105919..54c66a5216 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/line_continuat ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..36, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 4..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("a"), ctx: Load, @@ -40,7 +40,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("b"), ctx: Load, @@ -55,21 +55,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..35, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 20..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 23..25, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -80,7 +78,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..35, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap index 97fbdf8b65..f1ae6a18c9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/line_continuat ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..46, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("call"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 4..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("a"), ctx: Load, @@ -40,7 +40,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("b"), ctx: Load, @@ -55,21 +55,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..46, is_async: false, decorator_list: [], name: Identifier { id: Name("bar"), range: 30..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 33..35, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -80,7 +78,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..46, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap index 4aa6298cab..81e700a1d2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap @@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/triple_quoted_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..198, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..178, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..178, value: FStringValue { inner: Single( FString( FString { range: 166..178, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 170..176, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello ", }, ), Interpolation( InterpolatedElement { range: 176..178, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..178, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap index 6a553051a5..599be8b78d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap @@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/triple_quoted_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..183, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..183, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..183, value: FStringValue { inner: Single( FString( FString { range: 167..183, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 171..180, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..175, id: Name("foo"), ctx: Load, @@ -42,12 +42,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 176..180, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 176..180, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f\n", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap index 2db1a776b1..ce80ab0705 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/invalid/re_lexing/triple_quoted_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..262, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..262, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..253, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..238, id: Name("call"), ctx: Load, @@ -28,26 +28,26 @@ Module( ), arguments: Arguments { range: 238..253, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..253, value: FStringValue { inner: Single( FString( FString { range: 239..253, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 243..250, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 244..245, id: Name("x"), ctx: Load, @@ -58,12 +58,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 246..250, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 246..250, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f\n", }, ), @@ -92,7 +92,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..262, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap index e14ea1a654..589ef950bf 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/rebound_comprehension ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..342, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, elt: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..8, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, id: Name("a"), ctx: Store, @@ -32,7 +32,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, value: Int( 0, @@ -44,10 +44,10 @@ Module( generators: [ Comprehension { range: 10..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("a"), ctx: Store, @@ -55,11 +55,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..27, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..24, id: Name("range"), ctx: Load, @@ -67,11 +67,11 @@ Module( ), arguments: Arguments { range: 24..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, value: Int( 0, @@ -93,19 +93,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..57, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..57, elt: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..37, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..32, id: Name("a"), ctx: Store, @@ -113,7 +113,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, value: Int( 0, @@ -125,10 +125,10 @@ Module( generators: [ Comprehension { range: 39..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, id: Name("a"), ctx: Store, @@ -136,11 +136,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..56, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..53, id: Name("range"), ctx: Load, @@ -148,11 +148,11 @@ Module( ), arguments: Arguments { range: 53..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 0, @@ -174,19 +174,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..91, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..91, key: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..66, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("a"), ctx: Store, @@ -194,7 +194,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, value: Int( 0, @@ -205,7 +205,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..72, id: Name("val"), ctx: Load, @@ -214,10 +214,10 @@ Module( generators: [ Comprehension { range: 73..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("a"), ctx: Store, @@ -225,11 +225,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..90, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..87, id: Name("range"), ctx: Load, @@ -237,11 +237,11 @@ Module( ), arguments: Arguments { range: 87..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, value: Int( 0, @@ -263,15 +263,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..125, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..125, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..96, id: Name("key"), ctx: Load, @@ -279,11 +279,11 @@ Module( ), value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..105, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, id: Name("a"), ctx: Store, @@ -291,7 +291,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, value: Int( 0, @@ -303,10 +303,10 @@ Module( generators: [ Comprehension { range: 107..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..112, id: Name("a"), ctx: Store, @@ -314,11 +314,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..124, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..121, id: Name("range"), ctx: Load, @@ -326,11 +326,11 @@ Module( ), arguments: Arguments { range: 121..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, value: Int( 0, @@ -352,19 +352,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..154, value: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..154, elt: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..134, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, id: Name("a"), ctx: Store, @@ -372,7 +372,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..134, value: Int( 0, @@ -384,10 +384,10 @@ Module( generators: [ Comprehension { range: 136..153, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..141, id: Name("a"), ctx: Store, @@ -395,11 +395,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..153, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..150, id: Name("range"), ctx: Load, @@ -407,11 +407,11 @@ Module( ), arguments: Arguments { range: 150..153, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..152, value: Int( 0, @@ -434,24 +434,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..185, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..185, elt: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..166, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..164, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..159, id: Name("a"), ctx: Store, @@ -459,7 +459,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..164, value: Int( 0, @@ -475,10 +475,10 @@ Module( generators: [ Comprehension { range: 167..184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..172, id: Name("a"), ctx: Store, @@ -486,11 +486,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..184, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..181, id: Name("range"), ctx: Load, @@ -498,11 +498,11 @@ Module( ), arguments: Arguments { range: 181..184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..183, value: Int( 0, @@ -524,19 +524,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..233, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..233, elt: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..194, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..189, id: Name("a"), ctx: Store, @@ -544,7 +544,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..194, value: Int( 0, @@ -556,10 +556,10 @@ Module( generators: [ Comprehension { range: 196..214, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..201, id: Name("b"), ctx: Store, @@ -567,11 +567,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 205..214, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 205..210, id: Name("range"), ctx: Load, @@ -579,11 +579,11 @@ Module( ), arguments: Arguments { range: 211..214, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 212..213, value: Int( 0, @@ -600,10 +600,10 @@ Module( }, Comprehension { range: 215..232, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..220, id: Name("a"), ctx: Store, @@ -611,11 +611,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..232, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..229, id: Name("range"), ctx: Load, @@ -623,11 +623,11 @@ Module( ), arguments: Arguments { range: 229..232, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..231, value: Int( 0, @@ -649,19 +649,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..281, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..281, elt: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..242, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..237, id: Name("a"), ctx: Store, @@ -669,7 +669,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..242, value: Int( 0, @@ -681,10 +681,10 @@ Module( generators: [ Comprehension { range: 244..262, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 248..249, id: Name("a"), ctx: Store, @@ -692,11 +692,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..262, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..258, id: Name("range"), ctx: Load, @@ -704,11 +704,11 @@ Module( ), arguments: Arguments { range: 259..262, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..261, value: Int( 0, @@ -725,10 +725,10 @@ Module( }, Comprehension { range: 263..280, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 267..268, id: Name("b"), ctx: Store, @@ -736,11 +736,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 272..280, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 272..277, id: Name("range"), ctx: Load, @@ -748,11 +748,11 @@ Module( ), arguments: Arguments { range: 277..280, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 278..279, value: Int( 0, @@ -774,24 +774,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..341, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..341, elt: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 283..303, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 285..291, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 285..286, id: Name("a"), ctx: Store, @@ -799,7 +799,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..291, value: Int( 0, @@ -810,11 +810,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 295..301, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 295..296, id: Name("b"), ctx: Store, @@ -822,7 +822,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..301, value: Int( 1, @@ -839,10 +839,10 @@ Module( generators: [ Comprehension { range: 304..322, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 308..309, id: Name("a"), ctx: Store, @@ -850,11 +850,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..322, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..318, id: Name("range"), ctx: Load, @@ -862,11 +862,11 @@ Module( ), arguments: Arguments { range: 319..322, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 320..321, value: Int( 0, @@ -883,10 +883,10 @@ Module( }, Comprehension { range: 323..340, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..328, id: Name("b"), ctx: Store, @@ -894,11 +894,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 332..340, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 332..337, id: Name("range"), ctx: Load, @@ -906,11 +906,11 @@ Module( ), arguments: Arguments { range: 337..340, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 338..339, value: Int( 0, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap index b93edc683b..c6e921af83 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/return_stmt_invalid_e ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..74, body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, value: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..8, id: Name(""), ctx: Invalid, @@ -35,17 +35,17 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..23, value: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..23, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("x"), ctx: Load, @@ -59,16 +59,16 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..43, value: Some( YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..43, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, id: Name("x"), ctx: Load, @@ -81,12 +81,12 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..52, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, id: Name("x"), ctx: Load, @@ -97,11 +97,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, value: Int( 1, @@ -112,22 +112,22 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..73, value: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..73, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..73, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, id: Name("x"), ctx: Load, @@ -135,7 +135,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap index 208ce1f1b0..fe0e953b68 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/simple_and_compound_s ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("a"), ctx: Load, @@ -26,11 +26,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..16, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("b"), ctx: Load, @@ -39,17 +39,17 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, id: Name("b"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap index 5c6e1ab082..9364793f00 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/simple_and_compound_s ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..59, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, value: true, }, @@ -24,7 +24,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -34,11 +34,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..28, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..22, value: false, }, @@ -46,7 +46,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..28, }, ), @@ -56,11 +56,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..42, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..36, value: true, }, @@ -68,7 +68,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..42, }, ), @@ -78,11 +78,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..58, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..52, value: false, }, @@ -90,7 +90,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..58, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap index 3e2eb8febc..2fdd57a51a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/simple_stmts_on_same_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..53, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("a"), ctx: Load, @@ -26,11 +26,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, id: Name("b"), ctx: Load, @@ -40,15 +40,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..9, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..9, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("a"), ctx: Load, @@ -57,7 +57,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("b"), ctx: Load, @@ -69,15 +69,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..15, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..15, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("c"), ctx: Load, @@ -86,7 +86,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("d"), ctx: Load, @@ -98,31 +98,31 @@ Module( ), Break( StmtBreak { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..21, }, ), Continue( StmtContinue { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..31, }, ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..36, }, ), Continue( StmtContinue { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..46, }, ), Break( StmtBreak { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..52, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap index 0e424616ad..99af157a8e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/simple_stmts_on_same_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..46, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..45, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, value: true, }, @@ -24,31 +24,31 @@ Module( body: [ Break( StmtBreak { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..14, }, ), Continue( StmtContinue { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..24, }, ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..29, }, ), Continue( StmtContinue { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..39, }, ), Break( StmtBreak { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..45, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap index 75ce9e0320..ad76a4b9a2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/single_star_for.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..35, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("_"), ctx: Store, @@ -25,11 +25,11 @@ Module( ), iter: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..11, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("x"), ctx: Load, @@ -41,11 +41,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, }, ), @@ -57,16 +57,16 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..34, is_async: false, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..23, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("x"), ctx: Store, @@ -77,7 +77,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..29, id: Name("xs"), ctx: Load, @@ -86,11 +86,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap index 8c08d4f66c..c9515b946e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/single_star_return.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 5..7, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,16 +35,16 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..18, value: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..18, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap index 273bb6dd53..e4eaafb75c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/single_star_yield.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 5..7, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,20 +35,20 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..17, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..17, value: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..17, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap index fd275c3a2e..c619b3d415 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/single_starred_assign ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, targets: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..2, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, id: Name("a"), ctx: Store, @@ -33,12 +33,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..9, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap index 2f547ff272..23e829c384 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/star_index_py310.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..293, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..55, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..55, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..47, id: Name("lst"), ctx: Load, @@ -28,16 +28,16 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..54, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..54, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..54, id: Name("index"), ctx: Load, @@ -58,27 +58,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..112, decorator_list: [], name: Identifier { id: Name("Array"), range: 78..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 83..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..106, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..91, id: Name("Generic"), ctx: Load, @@ -86,12 +86,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..105, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..97, id: Name("DType"), ctx: Load, @@ -99,11 +99,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..105, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..105, id: Name("Shape"), ctx: Load, @@ -127,11 +127,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, }, ), @@ -142,15 +142,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..161, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..161, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..151, id: Name("lst"), ctx: Load, @@ -158,12 +158,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..160, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..153, id: Name("a"), ctx: Load, @@ -171,11 +171,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..157, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..157, id: Name("b"), ctx: Load, @@ -186,7 +186,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..160, id: Name("c"), ctx: Load, @@ -204,15 +204,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..198, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..198, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..188, id: Name("lst"), ctx: Load, @@ -220,12 +220,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..197, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, id: Name("a"), ctx: Load, @@ -233,7 +233,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..193, id: Name("b"), ctx: Load, @@ -241,11 +241,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 195..197, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..197, id: Name("c"), ctx: Load, @@ -266,15 +266,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..233, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..233, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..225, id: Name("lst"), ctx: Load, @@ -282,16 +282,16 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..232, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..228, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..228, id: Name("a"), ctx: Load, @@ -302,11 +302,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..232, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..232, id: Name("b"), ctx: Load, @@ -327,15 +327,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..271, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..271, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..259, id: Name("array"), ctx: Load, @@ -343,17 +343,17 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..270, elts: [ Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..263, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..261, value: Int( 3, @@ -364,7 +364,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 262..263, value: Int( 5, @@ -377,11 +377,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..270, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 266..270, id: Name("idxs"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap index 4f9cc982f6..d4d9df070f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/star_slices.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, id: Name("array"), ctx: Load, @@ -28,16 +28,16 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..17, lower: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..12, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..12, id: Name("start"), ctx: Load, @@ -50,11 +50,11 @@ Module( upper: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..17, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("end"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap index 5853cdff00..bafb792f6a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap @@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/function_type ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..988, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 796..824, is_async: false, decorator_list: [], name: Identifier { id: Name("keyword"), range: 800..807, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 807..817, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 808..809, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("A"), range: 808..809, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -42,11 +42,11 @@ Module( TypeVar( TypeParamTypeVar { range: 811..816, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("await"), range: 811..816, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -57,9 +57,7 @@ Module( ), parameters: Parameters { range: 817..819, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -70,11 +68,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 821..824, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 821..824, }, ), @@ -85,28 +83,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 826..862, is_async: false, decorator_list: [], name: Identifier { id: Name("not_a_type_param"), range: 830..846, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 846..855, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 847..848, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("A"), range: 847..848, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -115,11 +113,11 @@ Module( TypeVar( TypeParamTypeVar { range: 853..854, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("B"), range: 853..854, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -130,9 +128,7 @@ Module( ), parameters: Parameters { range: 855..857, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -143,11 +139,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 859..862, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 859..862, }, ), @@ -158,28 +154,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 864..896, is_async: false, decorator_list: [], name: Identifier { id: Name("multiple_commas"), range: 868..883, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 883..889, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 884..885, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("A"), range: 884..885, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -188,11 +184,11 @@ Module( TypeVar( TypeParamTypeVar { range: 887..888, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("B"), range: 887..888, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -203,9 +199,7 @@ Module( ), parameters: Parameters { range: 889..891, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -216,11 +210,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 893..896, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 893..896, }, ), @@ -231,28 +225,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 898..938, is_async: false, decorator_list: [], name: Identifier { id: Name("multiple_trailing_commas"), range: 902..926, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 926..931, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 927..928, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("A"), range: 927..928, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -263,9 +257,7 @@ Module( ), parameters: Parameters { range: 931..933, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -276,11 +268,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 935..938, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 935..938, }, ), @@ -291,28 +283,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 940..979, is_async: false, decorator_list: [], name: Identifier { id: Name("multiple_commas_and_recovery"), range: 944..972, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 972..976, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 973..974, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("A"), range: 973..974, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -323,9 +315,7 @@ Module( ), parameters: Parameters { range: 976..976, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -336,11 +326,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 976..979, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 976..979, value: Int( 100, @@ -354,11 +344,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 980..987, target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 980..982, elts: [], ctx: Store, @@ -367,7 +357,7 @@ Module( ), annotation: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 984..987, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap index 5ca66592b1..886c21590c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/if_extra_clos ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..110, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..97, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..97, value: true, }, @@ -27,7 +27,7 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..109, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap index 0a04441bbb..6a36fcb277 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/if_extra_inde ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..153, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..134, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..110, value: true, }, @@ -24,21 +24,21 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..120, }, ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..134, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..134, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, id: Name("a"), ctx: Load, @@ -47,7 +47,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..134, id: Name("b"), ctx: Load, @@ -63,18 +63,18 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..144, }, ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..152, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, id: Name("a"), ctx: Store, @@ -83,7 +83,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..152, value: Int( 10, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap index 26643d505d..6920a94c53 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/invalid_assig ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..788, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..206, targets: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..202, value: Int( 5, @@ -27,7 +27,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 205..206, value: Int( 3, @@ -38,11 +38,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..214, target: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..209, value: Int( 5, @@ -52,7 +52,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..214, value: Int( 3, @@ -63,11 +63,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 216..228, target: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..218, value: Int( 5, @@ -76,7 +76,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..224, id: Name("int"), ctx: Load, @@ -85,7 +85,7 @@ Module( value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..228, value: Int( 3, @@ -98,18 +98,18 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 303..314, targets: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 303..309, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 303..304, id: Name("x"), ctx: Load, @@ -117,7 +117,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 308..309, id: Name("y"), ctx: Load, @@ -129,7 +129,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..314, value: Int( 42, @@ -140,16 +140,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 315..328, targets: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 316..322, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 316..317, id: Name("x"), ctx: Store, @@ -157,7 +157,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..322, value: Int( 5, @@ -169,7 +169,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 326..328, value: Int( 42, @@ -180,16 +180,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 329..339, targets: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 329..334, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 329..330, id: Name("x"), ctx: Load, @@ -198,7 +198,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 333..334, id: Name("y"), ctx: Load, @@ -209,7 +209,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 337..339, value: Int( 42, @@ -220,17 +220,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..347, targets: [ UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..342, op: USub, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 341..342, id: Name("x"), ctx: Store, @@ -241,7 +241,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 345..347, value: Int( 42, @@ -252,31 +252,29 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..366, targets: [ Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 349..360, parameters: Some( Parameters { range: 356..357, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 356..357, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 356..357, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("_"), range: 356..357, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -290,7 +288,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 359..360, value: Int( 1, @@ -302,7 +300,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..366, value: Int( 42, @@ -313,16 +311,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 367..385, targets: [ If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 367..380, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 372..373, id: Name("b"), ctx: Load, @@ -330,7 +328,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 367..368, id: Name("a"), ctx: Load, @@ -338,7 +336,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 379..380, id: Name("c"), ctx: Load, @@ -349,7 +347,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..385, value: Int( 42, @@ -360,25 +358,25 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 386..399, targets: [ Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 386..394, items: [ DictItem { key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 387..390, value: StringLiteralValue { inner: Single( StringLiteral { range: 387..390, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", flags: StringLiteralFlags { quote_style: Double, @@ -393,7 +391,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 392..393, value: Int( 5, @@ -407,7 +405,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 397..399, value: Int( 42, @@ -418,17 +416,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 400..408, targets: [ Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 400..403, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 401..402, id: Name("a"), ctx: Load, @@ -440,7 +438,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 406..408, value: Int( 42, @@ -451,16 +449,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 409..429, targets: [ ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 409..424, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 410..411, id: Name("x"), ctx: Load, @@ -469,10 +467,10 @@ Module( generators: [ Comprehension { range: 412..423, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 416..417, id: Name("x"), ctx: Store, @@ -480,7 +478,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..423, id: Name("xs"), ctx: Load, @@ -495,7 +493,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 427..429, value: Int( 42, @@ -506,16 +504,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 430..450, targets: [ SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 430..445, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 431..432, id: Name("x"), ctx: Load, @@ -524,10 +522,10 @@ Module( generators: [ Comprehension { range: 433..444, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 437..438, id: Name("x"), ctx: Store, @@ -535,7 +533,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 442..444, id: Name("xs"), ctx: Load, @@ -550,7 +548,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 448..450, value: Int( 42, @@ -561,16 +559,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 451..478, targets: [ DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 451..473, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 452..453, id: Name("x"), ctx: Load, @@ -578,11 +576,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 455..460, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 455..456, id: Name("x"), ctx: Load, @@ -591,7 +589,7 @@ Module( op: Mult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 459..460, value: Int( 2, @@ -603,10 +601,10 @@ Module( generators: [ Comprehension { range: 461..472, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 465..466, id: Name("x"), ctx: Store, @@ -614,7 +612,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 470..472, id: Name("xs"), ctx: Load, @@ -629,7 +627,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 476..478, value: Int( 42, @@ -640,16 +638,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 479..499, targets: [ Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 479..494, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 480..481, id: Name("x"), ctx: Load, @@ -658,10 +656,10 @@ Module( generators: [ Comprehension { range: 482..493, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 486..487, id: Name("x"), ctx: Store, @@ -669,7 +667,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 491..493, id: Name("xs"), ctx: Load, @@ -685,7 +683,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 497..499, value: Int( 42, @@ -696,16 +694,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 500..512, targets: [ Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 500..507, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 506..507, id: Name("x"), ctx: Load, @@ -716,7 +714,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 510..512, value: Int( 42, @@ -727,17 +725,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 513..527, targets: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 514..521, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 520..521, id: Name("x"), ctx: Load, @@ -749,7 +747,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 525..527, value: Int( 42, @@ -760,16 +758,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 528..548, targets: [ YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 529..542, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 540..542, id: Name("xs"), ctx: Load, @@ -780,7 +778,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 546..548, value: Int( 42, @@ -791,16 +789,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 549..563, targets: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 549..558, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 549..550, id: Name("a"), ctx: Load, @@ -813,7 +811,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 553..554, id: Name("b"), ctx: Load, @@ -821,7 +819,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 557..558, id: Name("c"), ctx: Load, @@ -833,7 +831,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 561..563, value: Int( 42, @@ -844,16 +842,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 564..574, targets: [ Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 564..569, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 564..567, id: Name("foo"), ctx: Load, @@ -861,7 +859,7 @@ Module( ), arguments: Arguments { range: 567..569, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -870,7 +868,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 572..574, value: Int( 42, @@ -881,27 +879,27 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 576..590, targets: [ FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 576..585, value: FStringValue { inner: Single( FString( FString { range: 576..585, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 578..584, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 579..583, id: Name("quux"), ctx: Load, @@ -927,7 +925,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 588..590, value: Int( 42, @@ -938,27 +936,27 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 591..614, targets: [ FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 591..609, value: FStringValue { inner: Single( FString( FString { range: 591..609, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 593..598, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 594..597, id: Name("foo"), ctx: Load, @@ -972,17 +970,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 598..603, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " and ", }, ), Interpolation( InterpolatedElement { range: 603..608, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 604..607, id: Name("bar"), ctx: Load, @@ -1008,7 +1006,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 612..614, value: Int( 42, @@ -1019,18 +1017,18 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 616..626, targets: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 616..621, value: StringLiteralValue { inner: Single( StringLiteral { range: 616..621, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo", flags: StringLiteralFlags { quote_style: Double, @@ -1045,7 +1043,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 624..626, value: Int( 42, @@ -1056,18 +1054,18 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 627..638, targets: [ BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 627..633, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 627..633, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 102, 111, @@ -1086,7 +1084,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 636..638, value: Int( 42, @@ -1097,12 +1095,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 639..647, targets: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 639..642, value: Int( 123, @@ -1112,7 +1110,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 645..647, value: Int( 42, @@ -1123,12 +1121,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 648..657, targets: [ BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 648..652, value: true, }, @@ -1136,7 +1134,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 655..657, value: Int( 42, @@ -1147,19 +1145,19 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 658..667, targets: [ NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 658..662, }, ), ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 665..667, value: Int( 42, @@ -1170,19 +1168,19 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 668..676, targets: [ EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 668..671, }, ), ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 674..676, value: Int( 42, @@ -1193,20 +1191,20 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 677..688, targets: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 677..683, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 678..683, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 678..681, id: Name("foo"), ctx: Load, @@ -1214,7 +1212,7 @@ Module( ), arguments: Arguments { range: 681..683, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1226,7 +1224,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 686..688, value: Int( 42, @@ -1237,17 +1235,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 689..717, targets: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 689..702, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 690..691, id: Name("x"), ctx: Store, @@ -1255,11 +1253,11 @@ Module( ), Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 693..698, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 693..696, id: Name("foo"), ctx: Load, @@ -1267,7 +1265,7 @@ Module( ), arguments: Arguments { range: 696..698, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1275,7 +1273,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 700..701, id: Name("y"), ctx: Store, @@ -1288,12 +1286,12 @@ Module( ], value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 705..717, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 706..708, value: Int( 42, @@ -1302,7 +1300,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 710..712, value: Int( 42, @@ -1311,7 +1309,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 714..716, value: Int( 42, @@ -1326,22 +1324,22 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 718..758, targets: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 718..737, elts: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 719..725, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 720..721, id: Name("a"), ctx: Store, @@ -1349,7 +1347,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 723..724, id: Name("b"), ctx: Store, @@ -1361,17 +1359,17 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 727..733, elts: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 728..732, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 729..731, value: Int( 42, @@ -1388,7 +1386,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 735..736, id: Name("d"), ctx: Store, @@ -1401,17 +1399,17 @@ Module( ], value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 740..758, elts: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 741..747, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 742..743, value: Int( 1, @@ -1420,7 +1418,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 745..746, value: Int( 2, @@ -1433,17 +1431,17 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 749..754, elts: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 750..753, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 751..752, value: Int( 3, @@ -1460,7 +1458,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 756..757, value: Int( 4, @@ -1475,17 +1473,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 759..787, targets: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 759..772, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 760..761, id: Name("x"), ctx: Store, @@ -1493,11 +1491,11 @@ Module( ), Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 763..768, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 763..766, id: Name("foo"), ctx: Load, @@ -1505,7 +1503,7 @@ Module( ), arguments: Arguments { range: 766..768, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1513,7 +1511,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 770..771, id: Name("y"), ctx: Store, @@ -1527,12 +1525,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 775..787, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 776..778, value: Int( 42, @@ -1541,7 +1539,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 780..782, value: Int( 42, @@ -1550,7 +1548,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 784..786, value: Int( 42, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap index 788a678251..1ac04383c5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/invalid_augme ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..611, body: [ AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..109, target: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..103, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, id: Name("x"), ctx: Load, @@ -30,7 +30,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, id: Name("y"), ctx: Load, @@ -42,7 +42,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..109, value: Int( 42, @@ -53,15 +53,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..124, target: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..117, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..112, id: Name("x"), ctx: Store, @@ -69,7 +69,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..117, value: Int( 5, @@ -81,7 +81,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..124, value: Int( 42, @@ -92,15 +92,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..136, target: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..130, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..126, id: Name("x"), ctx: Load, @@ -109,7 +109,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, id: Name("y"), ctx: Load, @@ -120,7 +120,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..136, value: Int( 42, @@ -131,16 +131,16 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..145, target: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..139, op: USub, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 138..139, id: Name("x"), ctx: Store, @@ -151,7 +151,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..145, value: Int( 42, @@ -162,30 +162,28 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..165, target: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..158, parameters: Some( Parameters { range: 154..155, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 154..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 154..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("_"), range: 154..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -199,7 +197,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..158, value: Int( 1, @@ -211,7 +209,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..165, value: Int( 42, @@ -222,15 +220,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..185, target: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..179, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..172, id: Name("b"), ctx: Load, @@ -238,7 +236,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..167, id: Name("a"), ctx: Load, @@ -246,7 +244,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..179, id: Name("c"), ctx: Load, @@ -257,7 +255,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..185, value: Int( 42, @@ -268,24 +266,24 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..200, target: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..194, items: [ DictItem { key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..190, value: StringLiteralValue { inner: Single( StringLiteral { range: 187..190, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", flags: StringLiteralFlags { quote_style: Double, @@ -300,7 +298,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..193, value: Int( 5, @@ -314,7 +312,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 198..200, value: Int( 42, @@ -325,16 +323,16 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..210, target: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..204, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..203, id: Name("a"), ctx: Load, @@ -346,7 +344,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..210, value: Int( 42, @@ -357,15 +355,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..232, target: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..226, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 212..213, id: Name("x"), ctx: Load, @@ -374,10 +372,10 @@ Module( generators: [ Comprehension { range: 214..225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 218..219, id: Name("x"), ctx: Store, @@ -385,7 +383,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..225, id: Name("xs"), ctx: Load, @@ -400,7 +398,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..232, value: Int( 42, @@ -411,15 +409,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..254, target: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..248, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..235, id: Name("x"), ctx: Load, @@ -428,10 +426,10 @@ Module( generators: [ Comprehension { range: 236..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..241, id: Name("x"), ctx: Store, @@ -439,7 +437,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..247, id: Name("xs"), ctx: Load, @@ -454,7 +452,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 252..254, value: Int( 42, @@ -465,15 +463,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..283, target: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..277, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 256..257, id: Name("x"), ctx: Load, @@ -481,11 +479,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..264, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..260, id: Name("x"), ctx: Load, @@ -494,7 +492,7 @@ Module( op: Mult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 263..264, value: Int( 2, @@ -506,10 +504,10 @@ Module( generators: [ Comprehension { range: 265..276, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..270, id: Name("x"), ctx: Store, @@ -517,7 +515,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..276, id: Name("xs"), ctx: Load, @@ -532,7 +530,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..283, value: Int( 42, @@ -543,15 +541,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 284..305, target: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 284..299, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 285..286, id: Name("x"), ctx: Load, @@ -560,10 +558,10 @@ Module( generators: [ Comprehension { range: 287..298, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 291..292, id: Name("x"), ctx: Store, @@ -571,7 +569,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 296..298, id: Name("xs"), ctx: Load, @@ -587,7 +585,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 303..305, value: Int( 42, @@ -598,15 +596,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..319, target: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..313, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..313, id: Name("x"), ctx: Load, @@ -617,7 +615,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..319, value: Int( 42, @@ -628,16 +626,16 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 320..335, target: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..328, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..328, id: Name("x"), ctx: Load, @@ -649,7 +647,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 333..335, value: Int( 42, @@ -660,15 +658,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..357, target: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 337..350, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..350, id: Name("xs"), ctx: Load, @@ -679,7 +677,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 355..357, value: Int( 42, @@ -690,15 +688,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 358..373, target: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 358..367, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 358..359, id: Name("a"), ctx: Load, @@ -711,7 +709,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 362..363, id: Name("b"), ctx: Load, @@ -719,7 +717,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 366..367, id: Name("c"), ctx: Load, @@ -731,7 +729,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 371..373, value: Int( 42, @@ -742,15 +740,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 374..385, target: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 374..379, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 374..377, id: Name("foo"), ctx: Load, @@ -758,7 +756,7 @@ Module( ), arguments: Arguments { range: 377..379, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -767,7 +765,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..385, value: Int( 42, @@ -778,26 +776,26 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 387..402, target: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 387..396, value: FStringValue { inner: Single( FString( FString { range: 387..396, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 389..395, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 390..394, id: Name("quux"), ctx: Load, @@ -823,7 +821,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 400..402, value: Int( 42, @@ -834,26 +832,26 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..427, target: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..421, value: FStringValue { inner: Single( FString( FString { range: 403..421, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 405..410, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 406..409, id: Name("foo"), ctx: Load, @@ -867,17 +865,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 410..415, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " and ", }, ), Interpolation( InterpolatedElement { range: 415..420, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 416..419, id: Name("bar"), ctx: Load, @@ -903,7 +901,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 425..427, value: Int( 42, @@ -914,17 +912,17 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 429..440, target: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 429..434, value: StringLiteralValue { inner: Single( StringLiteral { range: 429..434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo", flags: StringLiteralFlags { quote_style: Double, @@ -939,7 +937,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 438..440, value: Int( 42, @@ -950,17 +948,17 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 441..453, target: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 441..447, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 441..447, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 102, 111, @@ -979,7 +977,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 451..453, value: Int( 42, @@ -990,11 +988,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 454..463, target: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 454..457, value: Int( 123, @@ -1004,7 +1002,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 461..463, value: Int( 42, @@ -1015,11 +1013,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 464..474, target: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 464..468, value: true, }, @@ -1027,7 +1025,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 472..474, value: Int( 42, @@ -1038,18 +1036,18 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 475..485, target: NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 475..479, }, ), op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 483..485, value: Int( 42, @@ -1060,18 +1058,18 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 486..495, target: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 486..489, }, ), op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 493..495, value: Int( 42, @@ -1082,19 +1080,19 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 496..508, target: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 496..502, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 497..502, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 497..500, id: Name("foo"), ctx: Load, @@ -1102,7 +1100,7 @@ Module( ), arguments: Arguments { range: 500..502, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1114,7 +1112,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 506..508, value: Int( 42, @@ -1125,16 +1123,16 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 509..538, target: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 509..522, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 510..511, id: Name("x"), ctx: Store, @@ -1142,11 +1140,11 @@ Module( ), Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 513..518, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 513..516, id: Name("foo"), ctx: Load, @@ -1154,7 +1152,7 @@ Module( ), arguments: Arguments { range: 516..518, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1162,7 +1160,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 520..521, id: Name("y"), ctx: Store, @@ -1175,12 +1173,12 @@ Module( op: Add, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 526..538, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 527..529, value: Int( 42, @@ -1189,7 +1187,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 531..533, value: Int( 42, @@ -1198,7 +1196,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 535..537, value: Int( 42, @@ -1213,21 +1211,21 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 539..580, target: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 539..558, elts: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 540..546, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 541..542, id: Name("a"), ctx: Store, @@ -1235,7 +1233,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 544..545, id: Name("b"), ctx: Store, @@ -1247,17 +1245,17 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 548..554, elts: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 549..553, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 550..552, value: Int( 42, @@ -1274,7 +1272,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 556..557, id: Name("d"), ctx: Store, @@ -1287,17 +1285,17 @@ Module( op: Add, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 562..580, elts: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 563..569, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 564..565, value: Int( 1, @@ -1306,7 +1304,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 567..568, value: Int( 2, @@ -1319,17 +1317,17 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 571..576, elts: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 572..575, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 573..574, value: Int( 3, @@ -1346,7 +1344,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 578..579, value: Int( 4, @@ -1361,16 +1359,16 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 581..610, target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 581..594, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 582..583, id: Name("x"), ctx: Store, @@ -1378,11 +1376,11 @@ Module( ), Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 585..590, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 585..588, id: Name("foo"), ctx: Load, @@ -1390,7 +1388,7 @@ Module( ), arguments: Arguments { range: 588..590, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1398,7 +1396,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 592..593, id: Name("y"), ctx: Store, @@ -1412,12 +1410,12 @@ Module( op: Add, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 598..610, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 599..601, value: Int( 42, @@ -1426,7 +1424,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 603..605, value: Int( 42, @@ -1435,7 +1433,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 607..609, value: Int( 42, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap index 58087f43bd..27c349f705 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/as_patt ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..198, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..197, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, id: Name("subject"), ctx: Load, @@ -25,14 +25,14 @@ Module( cases: [ MatchCase { range: 127..197, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 132..146, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..139, id: Name(""), ctx: Invalid, @@ -40,18 +40,18 @@ Module( ), arguments: PatternArguments { range: 140..146, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 141..142, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 141..142, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -59,13 +59,13 @@ Module( MatchAs( PatternMatchAs { range: 144..145, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("b"), range: 144..145, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -79,7 +79,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..197, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap index c33ba5de9a..4ef2b99dcf 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/as_patt ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..210, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..209, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, id: Name("subject"), ctx: Load, @@ -25,18 +25,18 @@ Module( cases: [ MatchCase { range: 140..209, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 145..158, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..158, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..152, id: Name(""), ctx: Invalid, @@ -45,7 +45,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..158, value: Complex { real: 0.0, @@ -61,7 +61,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 205..209, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap index 056268c64d..b649717bab 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/as_patt ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..190, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..176, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, id: Name("subject"), ctx: Load, @@ -25,22 +25,22 @@ Module( cases: [ MatchCase { range: 159..176, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 164..170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchAs( PatternMatchAs { range: 164..165, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 164..165, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -50,7 +50,7 @@ Module( Identifier { id: Name("y"), range: 169..170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -59,16 +59,16 @@ Module( body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..176, target: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..175, op: UAdd, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 173..175, value: Complex { real: 0.0, @@ -80,7 +80,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..176, id: Name(""), ctx: Invalid, @@ -97,7 +97,7 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..189, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap index 6ebf0be44b..74014165fd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/as_patt ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..136, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..120, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, id: Name("subject"), ctx: Load, @@ -25,37 +25,37 @@ Module( cases: [ MatchCase { range: 103..120, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 108..117, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, items: [], }, ), arguments: PatternArguments { range: 109..117, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 110..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchAs( PatternMatchAs { range: 110..111, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 110..111, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -65,7 +65,7 @@ Module( Identifier { id: Name("y"), range: 115..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -79,11 +79,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, value: Int( 1, @@ -99,7 +99,7 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..135, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap index 6d705cce3a..4ec3c13511 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/as_patt ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..187, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..186, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, id: Name("subject"), ctx: Load, @@ -25,15 +25,15 @@ Module( cases: [ MatchCase { range: 156..186, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 161..172, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..163, id: Name("x"), ctx: Store, @@ -41,7 +41,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..168, id: Name("y"), ctx: Store, @@ -52,13 +52,13 @@ Module( MatchAs( PatternMatchAs { range: 164..166, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("as"), range: 164..166, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -66,10 +66,10 @@ Module( MatchValue( PatternMatchValue { range: 170..171, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..171, value: Int( 1, @@ -86,7 +86,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..186, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap index 1687f42248..e5f771dfd8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/invalid ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..383, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..285, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..57, id: Name("subject"), ctx: Load, @@ -25,14 +25,14 @@ Module( cases: [ MatchCase { range: 63..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 68..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..71, id: Name("Foo"), ctx: Load, @@ -40,24 +40,24 @@ Module( ), arguments: PatternArguments { range: 71..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 72..82, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name(""), range: 80..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 81..82, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, value: Int( 1, @@ -75,7 +75,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..97, }, ), @@ -83,14 +83,14 @@ Module( }, MatchCase { range: 102..135, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 107..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..110, id: Name("Foo"), ctx: Load, @@ -98,24 +98,24 @@ Module( ), arguments: PatternArguments { range: 110..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 111..120, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name(""), range: 118..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 119..120, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, value: Int( 1, @@ -133,7 +133,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..135, }, ), @@ -141,14 +141,14 @@ Module( }, MatchCase { range: 140..174, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 145..160, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..148, id: Name("Foo"), ctx: Load, @@ -156,24 +156,24 @@ Module( ), arguments: PatternArguments { range: 148..160, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 149..159, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name(""), range: 157..157, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 158..159, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..159, value: Int( 1, @@ -191,7 +191,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..174, }, ), @@ -199,14 +199,14 @@ Module( }, MatchCase { range: 179..217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 184..203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 184..187, id: Name("Foo"), ctx: Load, @@ -214,24 +214,24 @@ Module( ), arguments: PatternArguments { range: 187..203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 188..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name(""), range: 200..200, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 201..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..202, value: Int( 1, @@ -249,7 +249,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..217, }, ), @@ -257,14 +257,14 @@ Module( }, MatchCase { range: 222..249, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 227..235, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..230, id: Name("Foo"), ctx: Load, @@ -272,24 +272,24 @@ Module( ), arguments: PatternArguments { range: 230..235, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 231..234, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name(""), range: 233..233, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 233..234, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..234, value: Int( 1, @@ -307,7 +307,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..249, }, ), @@ -315,14 +315,14 @@ Module( }, MatchCase { range: 254..285, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 259..271, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..262, id: Name("Foo"), ctx: Load, @@ -330,24 +330,24 @@ Module( ), arguments: PatternArguments { range: 262..271, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 263..270, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name(""), range: 269..269, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 269..270, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..270, value: Int( 1, @@ -365,7 +365,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..285, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap index abf680ec65..978a1633e1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/invalid ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..695, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..332, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..25, id: Name("invalid_lhs_pattern"), ctx: Load, @@ -25,22 +25,22 @@ Module( cases: [ MatchCase { range: 31..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 36..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..46, left: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..41, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..39, id: Name("Foo"), ctx: Load, @@ -48,7 +48,7 @@ Module( ), arguments: Arguments { range: 39..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -57,7 +57,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..46, value: Complex { real: 0.0, @@ -73,7 +73,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..60, }, ), @@ -81,18 +81,18 @@ Module( }, MatchCase { range: 65..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 70..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..76, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, id: Name("x"), ctx: Store, @@ -101,7 +101,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..76, value: Complex { real: 0.0, @@ -117,7 +117,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..90, }, ), @@ -125,18 +125,18 @@ Module( }, MatchCase { range: 95..120, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 100..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..106, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, id: Name("_"), ctx: Store, @@ -145,7 +145,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..106, value: Complex { real: 0.0, @@ -161,7 +161,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..120, }, ), @@ -169,22 +169,22 @@ Module( }, MatchCase { range: 125..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 130..142, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..142, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..136, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..132, value: Int( 1, @@ -194,7 +194,7 @@ Module( op: BitOr, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, value: Int( 2, @@ -206,7 +206,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..142, value: Complex { real: 0.0, @@ -222,7 +222,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..156, }, ), @@ -230,23 +230,23 @@ Module( }, MatchCase { range: 161..191, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 166..177, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..177, left: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..172, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..168, value: Int( 1, @@ -255,7 +255,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..171, value: Int( 2, @@ -269,7 +269,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..177, value: Complex { real: 0.0, @@ -285,7 +285,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..191, }, ), @@ -293,25 +293,25 @@ Module( }, MatchCase { range: 196..229, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 201..215, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..215, left: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..210, items: [ DictItem { key: Some( BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..206, value: true, }, @@ -319,7 +319,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..209, value: Int( 1, @@ -333,7 +333,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..215, value: Complex { real: 0.0, @@ -349,7 +349,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..229, }, ), @@ -357,18 +357,18 @@ Module( }, MatchCase { range: 234..260, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 239..246, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..246, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..241, value: Complex { real: 0.0, @@ -379,7 +379,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 244..246, value: Complex { real: 0.0, @@ -395,7 +395,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 256..260, }, ), @@ -403,23 +403,23 @@ Module( }, MatchCase { range: 265..292, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 270..278, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 270..278, left: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 270..273, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..273, value: Complex { real: 0.0, @@ -432,7 +432,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 276..278, value: Complex { real: 0.0, @@ -448,7 +448,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 288..292, }, ), @@ -456,22 +456,22 @@ Module( }, MatchCase { range: 297..332, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 302..318, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 302..318, left: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 302..313, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 302..305, id: Name("Foo"), ctx: Load, @@ -479,11 +479,11 @@ Module( ), arguments: Arguments { range: 305..313, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..312, id: Name(""), ctx: Invalid, @@ -497,7 +497,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 316..318, value: Complex { real: 0.0, @@ -513,7 +513,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 328..332, }, ), @@ -524,11 +524,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 334..625, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..359, id: Name("invalid_rhs_pattern"), ctx: Load, @@ -537,18 +537,18 @@ Module( cases: [ MatchCase { range: 365..393, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 370..379, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 370..379, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 370..371, value: Int( 1, @@ -558,11 +558,11 @@ Module( op: Add, right: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 374..379, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 374..377, id: Name("Foo"), ctx: Load, @@ -570,7 +570,7 @@ Module( ), arguments: Arguments { range: 377..379, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -584,7 +584,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 389..393, }, ), @@ -592,18 +592,18 @@ Module( }, MatchCase { range: 398..422, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 403..408, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..408, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..404, value: Int( 2, @@ -613,7 +613,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 407..408, id: Name("x"), ctx: Store, @@ -627,7 +627,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 418..422, }, ), @@ -635,18 +635,18 @@ Module( }, MatchCase { range: 427..451, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 432..437, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 432..437, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 432..433, value: Int( 3, @@ -656,7 +656,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 436..437, id: Name("_"), ctx: Store, @@ -670,7 +670,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 447..451, }, ), @@ -678,18 +678,18 @@ Module( }, MatchCase { range: 456..486, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 461..472, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 461..472, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 461..462, value: Int( 4, @@ -699,11 +699,11 @@ Module( op: Add, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 466..471, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 466..467, value: Int( 1, @@ -713,7 +713,7 @@ Module( op: BitOr, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 470..471, value: Int( 2, @@ -730,7 +730,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 482..486, }, ), @@ -738,18 +738,18 @@ Module( }, MatchCase { range: 491..520, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 496..506, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 496..506, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 496..497, value: Int( 5, @@ -759,12 +759,12 @@ Module( op: Add, right: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 500..506, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 501..502, value: Int( 1, @@ -773,7 +773,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 504..505, value: Int( 2, @@ -792,7 +792,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 516..520, }, ), @@ -800,18 +800,18 @@ Module( }, MatchCase { range: 525..557, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 530..543, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 530..543, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 530..531, value: Int( 6, @@ -821,14 +821,14 @@ Module( op: Add, right: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 534..543, items: [ DictItem { key: Some( BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 535..539, value: true, }, @@ -836,7 +836,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 541..542, value: Int( 1, @@ -855,7 +855,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 553..557, }, ), @@ -863,18 +863,18 @@ Module( }, MatchCase { range: 562..586, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 567..572, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 567..572, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 567..568, value: Int( 1, @@ -884,7 +884,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 571..572, value: Int( 2, @@ -899,7 +899,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 582..586, }, ), @@ -907,18 +907,18 @@ Module( }, MatchCase { range: 591..625, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 596..611, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 596..611, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 596..597, value: Int( 1, @@ -928,11 +928,11 @@ Module( op: Add, right: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 600..611, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 600..603, id: Name("Foo"), ctx: Load, @@ -940,11 +940,11 @@ Module( ), arguments: Arguments { range: 603..611, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 604..610, id: Name(""), ctx: Invalid, @@ -963,7 +963,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 621..625, }, ), @@ -974,11 +974,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 627..694, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 633..656, id: Name("invalid_lhs_rhs_pattern"), ctx: Load, @@ -987,22 +987,22 @@ Module( cases: [ MatchCase { range: 662..694, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 667..680, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 667..680, left: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 667..672, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 667..670, id: Name("Foo"), ctx: Load, @@ -1010,7 +1010,7 @@ Module( ), arguments: Arguments { range: 670..672, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1019,11 +1019,11 @@ Module( op: Add, right: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 675..680, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 675..678, id: Name("Bar"), ctx: Load, @@ -1031,7 +1031,7 @@ Module( ), arguments: Arguments { range: 678..680, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1045,7 +1045,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 690..694, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap index 69e3b740ee..67b66ad2ea 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/invalid ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..509, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..209, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..74, id: Name("subject"), ctx: Load, @@ -25,19 +25,19 @@ Module( cases: [ MatchCase { range: 80..105, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 85..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..90, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..90, id: Name("key"), ctx: Store, @@ -51,10 +51,10 @@ Module( MatchValue( PatternMatchValue { range: 90..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..90, id: Name(""), ctx: Invalid, @@ -70,7 +70,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..105, }, ), @@ -78,19 +78,19 @@ Module( }, MatchCase { range: 110..138, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 115..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..120, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..120, id: Name("key"), ctx: Store, @@ -104,10 +104,10 @@ Module( MatchValue( PatternMatchValue { range: 122..123, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, value: Int( 1, @@ -124,7 +124,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..138, }, ), @@ -132,19 +132,19 @@ Module( }, MatchCase { range: 143..170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 148..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..153, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..153, id: Name("key"), ctx: Store, @@ -158,10 +158,10 @@ Module( MatchValue( PatternMatchValue { range: 154..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..155, value: Int( 1, @@ -178,7 +178,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..170, }, ), @@ -186,19 +186,19 @@ Module( }, MatchCase { range: 175..209, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 180..195, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..185, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..185, id: Name("key"), ctx: Store, @@ -209,7 +209,7 @@ Module( ), NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..191, }, ), @@ -218,10 +218,10 @@ Module( MatchValue( PatternMatchValue { range: 185..185, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..185, id: Name(""), ctx: Invalid, @@ -232,10 +232,10 @@ Module( MatchValue( PatternMatchValue { range: 193..194, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..194, value: Int( 1, @@ -252,7 +252,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 205..209, }, ), @@ -263,11 +263,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 305..462, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 311..318, id: Name("subject"), ctx: Load, @@ -276,15 +276,15 @@ Module( cases: [ MatchCase { range: 324..360, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 329..346, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 338..342, }, ), @@ -293,10 +293,10 @@ Module( MatchValue( PatternMatchValue { range: 344..345, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..345, value: Int( 1, @@ -310,7 +310,7 @@ Module( Identifier { id: Name("rest"), range: 332..336, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -319,7 +319,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 356..360, }, ), @@ -327,15 +327,15 @@ Module( }, MatchCase { range: 365..411, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 370..397, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 389..393, }, ), @@ -344,10 +344,10 @@ Module( MatchValue( PatternMatchValue { range: 395..396, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 395..396, value: Int( 1, @@ -361,7 +361,7 @@ Module( Identifier { id: Name("rest2"), range: 382..387, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -370,7 +370,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 407..411, }, ), @@ -378,15 +378,15 @@ Module( }, MatchCase { range: 416..462, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 421..448, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 431..435, }, ), @@ -395,10 +395,10 @@ Module( MatchValue( PatternMatchValue { range: 437..438, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 437..438, value: Int( 1, @@ -412,7 +412,7 @@ Module( Identifier { id: Name("rest2"), range: 442..447, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -421,7 +421,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 458..462, }, ), @@ -432,11 +432,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 464..509, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 470..477, id: Name("subject"), ctx: Load, @@ -445,19 +445,19 @@ Module( cases: [ MatchCase { range: 483..509, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 488..504, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 489..500, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 489..492, id: Name("Foo"), ctx: Load, @@ -465,11 +465,11 @@ Module( ), arguments: Arguments { range: 492..500, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 493..499, id: Name(""), ctx: Invalid, @@ -485,10 +485,10 @@ Module( MatchValue( PatternMatchValue { range: 502..503, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 502..503, value: Int( 1, @@ -505,11 +505,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 506..509, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 506..509, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap index ca41862659..121bc2d2a5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/star_pa ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..408, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..407, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..70, id: Name("subject"), ctx: Load, @@ -25,11 +25,11 @@ Module( cases: [ MatchCase { range: 76..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchStar( PatternMatchStar { range: 81..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: None, }, ), @@ -37,7 +37,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..97, }, ), @@ -45,16 +45,16 @@ Module( }, MatchCase { range: 102..128, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 107..114, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchStar( PatternMatchStar { range: 107..109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: None, }, ), @@ -63,7 +63,7 @@ Module( Identifier { id: Name("x"), range: 113..114, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -72,7 +72,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..128, }, ), @@ -80,16 +80,16 @@ Module( }, MatchCase { range: 133..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchStar( PatternMatchStar { range: 138..142, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Some( Identifier { id: Name("foo"), range: 139..142, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -98,7 +98,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..156, }, ), @@ -106,21 +106,21 @@ Module( }, MatchCase { range: 161..188, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 166..174, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchStar( PatternMatchStar { range: 166..170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Some( Identifier { id: Name("foo"), range: 167..170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -128,10 +128,10 @@ Module( MatchValue( PatternMatchValue { range: 173..174, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 173..174, value: Int( 1, @@ -147,7 +147,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 184..188, }, ), @@ -155,19 +155,19 @@ Module( }, MatchCase { range: 193..220, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 198..206, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 198..199, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 198..199, value: Int( 1, @@ -179,12 +179,12 @@ Module( MatchStar( PatternMatchStar { range: 202..206, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Some( Identifier { id: Name("foo"), range: 203..206, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -196,7 +196,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 216..220, }, ), @@ -204,14 +204,14 @@ Module( }, MatchCase { range: 225..251, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 230..237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..233, id: Name("Foo"), ctx: Load, @@ -219,12 +219,12 @@ Module( ), arguments: PatternArguments { range: 233..237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchStar( PatternMatchStar { range: 234..236, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: None, }, ), @@ -237,7 +237,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 247..251, }, ), @@ -245,14 +245,14 @@ Module( }, MatchCase { range: 256..284, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 261..270, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 261..264, id: Name("Foo"), ctx: Load, @@ -260,21 +260,21 @@ Module( ), arguments: PatternArguments { range: 264..270, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 265..269, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 265..266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchStar( PatternMatchStar { range: 267..269, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: None, }, ), @@ -287,7 +287,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 280..284, }, ), @@ -295,19 +295,19 @@ Module( }, MatchCase { range: 289..312, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 294..298, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 295..297, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 296..297, id: Name("_"), ctx: Store, @@ -321,10 +321,10 @@ Module( MatchValue( PatternMatchValue { range: 297..297, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 297..297, id: Name(""), ctx: Invalid, @@ -340,7 +340,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 308..312, }, ), @@ -348,19 +348,19 @@ Module( }, MatchCase { range: 317..343, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 322..329, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 323..325, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..325, id: Name("_"), ctx: Store, @@ -374,10 +374,10 @@ Module( MatchValue( PatternMatchValue { range: 327..328, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..328, value: Int( 1, @@ -394,7 +394,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 339..343, }, ), @@ -402,15 +402,15 @@ Module( }, MatchCase { range: 348..377, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 353..363, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 354..358, }, ), @@ -419,7 +419,7 @@ Module( MatchStar( PatternMatchStar { range: 360..362, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: None, }, ), @@ -431,7 +431,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 373..377, }, ), @@ -439,18 +439,18 @@ Module( }, MatchCase { range: 382..407, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 387..393, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 387..393, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 387..388, value: Int( 1, @@ -460,11 +460,11 @@ Module( op: Add, right: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 391..393, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 392..393, id: Name("_"), ctx: Store, @@ -481,7 +481,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..407, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap index b0a9f945ab..fe42f9c289 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/match/unary_a ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..269, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..268, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..87, id: Name("subject"), ctx: Load, @@ -25,19 +25,19 @@ Module( cases: [ MatchCase { range: 93..114, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 98..100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..100, op: UAdd, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, value: Int( 1, @@ -52,7 +52,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..114, }, ), @@ -60,19 +60,19 @@ Module( }, MatchCase { range: 119..149, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 124..135, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 124..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..125, value: Int( 1, @@ -84,15 +84,15 @@ Module( MatchValue( PatternMatchValue { range: 128..130, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..130, op: UAdd, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, value: Int( 2, @@ -106,15 +106,15 @@ Module( MatchValue( PatternMatchValue { range: 133..135, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..135, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..135, value: Int( 3, @@ -132,7 +132,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..149, }, ), @@ -140,19 +140,19 @@ Module( }, MatchCase { range: 154..184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 159..170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 160..161, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..161, value: Int( 1, @@ -164,15 +164,15 @@ Module( MatchValue( PatternMatchValue { range: 163..165, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..165, op: UAdd, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..165, value: Int( 2, @@ -186,15 +186,15 @@ Module( MatchValue( PatternMatchValue { range: 167..169, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..169, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..169, value: Int( 3, @@ -212,7 +212,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 180..184, }, ), @@ -220,14 +220,14 @@ Module( }, MatchCase { range: 189..223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 194..209, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..197, id: Name("Foo"), ctx: Load, @@ -235,29 +235,29 @@ Module( ), arguments: PatternArguments { range: 197..209, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 198..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 198..199, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 200..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..202, op: UAdd, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..202, value: Int( 1, @@ -271,24 +271,24 @@ Module( }, PatternKeyword { range: 204..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("y"), range: 204..205, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 206..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..208, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..208, value: Int( 2, @@ -308,7 +308,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..223, }, ), @@ -316,22 +316,22 @@ Module( }, MatchCase { range: 228..268, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 233..254, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..238, value: true, }, ), BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 244..249, value: false, }, @@ -341,15 +341,15 @@ Module( MatchValue( PatternMatchValue { range: 240..242, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..242, op: UAdd, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..242, value: Int( 1, @@ -363,15 +363,15 @@ Module( MatchValue( PatternMatchValue { range: 251..253, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 251..253, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 252..253, value: Int( 2, @@ -390,7 +390,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..268, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap index 3c07014614..9d872e920e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap @@ -7,26 +7,26 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/with/ambiguou ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..950, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..188, is_async: false, items: [ WithItem { range: 168..182, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..182, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..174, id: Name("item1"), ctx: Load, @@ -34,7 +34,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..181, id: Name("item2"), ctx: Load, @@ -51,11 +51,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..188, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..188, }, ), @@ -66,21 +66,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..219, is_async: false, items: [ WithItem { range: 194..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..208, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 195..200, id: Name("item1"), ctx: Load, @@ -88,7 +88,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..207, id: Name("item2"), ctx: Load, @@ -103,10 +103,10 @@ Module( }, WithItem { range: 213..214, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..214, id: Name("f"), ctx: Load, @@ -118,11 +118,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 216..219, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 216..219, }, ), @@ -133,21 +133,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..252, is_async: false, items: [ WithItem { range: 225..239, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..239, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..231, id: Name("item1"), ctx: Load, @@ -155,7 +155,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..238, id: Name("item2"), ctx: Load, @@ -170,10 +170,10 @@ Module( }, WithItem { range: 241..246, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..246, id: Name("item3"), ctx: Load, @@ -185,11 +185,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 249..252, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 249..252, }, ), @@ -200,20 +200,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..270, is_async: false, items: [ WithItem { range: 258..265, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..264, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..264, id: Name("item"), ctx: Load, @@ -228,11 +228,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 267..270, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 267..270, }, ), @@ -243,20 +243,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..293, is_async: false, items: [ WithItem { range: 276..288, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 277..282, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 278..282, id: Name("item"), ctx: Load, @@ -268,7 +268,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 287..288, id: Name("f"), ctx: Store, @@ -280,11 +280,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..293, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..293, }, ), @@ -295,20 +295,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 294..321, is_async: false, items: [ WithItem { range: 300..315, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..310, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..304, id: Name("item"), ctx: Store, @@ -316,7 +316,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 308..310, value: Int( 10, @@ -328,7 +328,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 314..315, id: Name("f"), ctx: Store, @@ -340,11 +340,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 318..321, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 318..321, }, ), @@ -355,16 +355,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 322..357, is_async: false, items: [ WithItem { range: 328..333, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 328..333, id: Name("item1"), ctx: Load, @@ -374,14 +374,14 @@ Module( }, WithItem { range: 335..351, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..346, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..340, id: Name("item2"), ctx: Store, @@ -389,7 +389,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..346, value: Int( 10, @@ -401,7 +401,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 350..351, id: Name("f"), ctx: Store, @@ -413,11 +413,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 354..357, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 354..357, }, ), @@ -428,20 +428,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 358..396, is_async: false, items: [ WithItem { range: 363..384, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 363..384, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..365, id: Name("x"), ctx: Load, @@ -450,10 +450,10 @@ Module( generators: [ Comprehension { range: 366..384, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 370..371, id: Name("x"), ctx: Store, @@ -461,11 +461,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 375..384, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 375..380, id: Name("range"), ctx: Load, @@ -473,11 +473,11 @@ Module( ), arguments: Arguments { range: 380..384, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 381..383, value: Int( 10, @@ -500,10 +500,10 @@ Module( }, WithItem { range: 386..390, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 386..390, id: Name("item"), ctx: Load, @@ -515,11 +515,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 393..396, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 393..396, }, ), @@ -530,21 +530,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 397..410, is_async: false, items: [ WithItem { range: 402..410, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 402..410, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..407, id: Name("item"), ctx: Load, @@ -552,7 +552,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 409..410, id: Name("x"), ctx: Load, @@ -571,12 +571,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 411..429, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 415..416, id: Name("x"), ctx: Store, @@ -584,11 +584,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 420..429, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 420..425, id: Name("range"), ctx: Load, @@ -596,11 +596,11 @@ Module( ), arguments: Arguments { range: 425..429, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 426..428, value: Int( 10, @@ -618,11 +618,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 432..435, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 432..435, }, ), @@ -630,20 +630,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 496..515, is_async: false, items: [ WithItem { range: 502..509, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 503..508, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 504..508, id: Name("item"), ctx: Load, @@ -658,11 +658,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 512..515, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 512..515, }, ), @@ -673,24 +673,24 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 517..551, is_async: false, items: [ WithItem { range: 522..539, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 522..539, elt: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 523..525, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 524..525, id: Name("x"), ctx: Load, @@ -702,10 +702,10 @@ Module( generators: [ Comprehension { range: 526..539, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 530..531, id: Name("x"), ctx: Store, @@ -713,7 +713,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 535..539, id: Name("iter"), ctx: Load, @@ -730,10 +730,10 @@ Module( }, WithItem { range: 541..545, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 541..545, id: Name("item"), ctx: Load, @@ -745,11 +745,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 548..551, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 548..551, }, ), @@ -760,21 +760,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 552..567, is_async: false, items: [ WithItem { range: 557..567, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 557..567, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 558..563, id: Name("item1"), ctx: Load, @@ -782,11 +782,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 565..567, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 566..567, id: Name("x"), ctx: Load, @@ -808,12 +808,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 568..588, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 572..573, id: Name("x"), ctx: Store, @@ -821,12 +821,12 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 577..588, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 577..581, id: Name("iter"), ctx: Load, @@ -834,7 +834,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 583..588, id: Name("item2"), ctx: Load, @@ -851,11 +851,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 591..594, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 591..594, }, ), @@ -863,16 +863,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 595..617, is_async: false, items: [ WithItem { range: 601..607, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 601..602, id: Name("x"), ctx: Load, @@ -881,7 +881,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 606..607, id: Name("f"), ctx: Store, @@ -891,14 +891,14 @@ Module( }, WithItem { range: 609..611, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 609..611, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 610..611, id: Name("y"), ctx: Load, @@ -913,11 +913,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 614..617, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 614..617, }, ), @@ -928,20 +928,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 618..640, is_async: false, items: [ WithItem { range: 624..626, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 624..626, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 625..626, id: Name("x"), ctx: Load, @@ -954,10 +954,10 @@ Module( }, WithItem { range: 628..634, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 628..629, id: Name("y"), ctx: Load, @@ -966,7 +966,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 633..634, id: Name("f"), ctx: Store, @@ -978,11 +978,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 637..640, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 637..640, }, ), @@ -993,21 +993,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 641..663, is_async: false, items: [ WithItem { range: 646..658, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 646..658, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 647..648, id: Name("x"), ctx: Load, @@ -1015,12 +1015,12 @@ Module( ), Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 650..657, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 656..657, id: Name("y"), ctx: Load, @@ -1040,11 +1040,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 660..663, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 660..663, }, ), @@ -1055,21 +1055,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 664..689, is_async: false, items: [ WithItem { range: 669..684, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 669..684, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 670..671, id: Name("x"), ctx: Load, @@ -1077,17 +1077,17 @@ Module( ), Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 673..683, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 679..683, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 679..680, id: Name("y"), ctx: Load, @@ -1095,7 +1095,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 682..683, id: Name("z"), ctx: Load, @@ -1120,11 +1120,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 686..689, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 686..689, }, ), @@ -1135,21 +1135,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 690..717, is_async: false, items: [ WithItem { range: 695..712, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 695..712, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 696..697, id: Name("x"), ctx: Load, @@ -1157,11 +1157,11 @@ Module( ), YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 699..711, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 710..711, id: Name("y"), ctx: Load, @@ -1180,11 +1180,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 714..717, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 714..717, }, ), @@ -1195,16 +1195,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 718..734, is_async: false, items: [ WithItem { range: 724..730, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 724..725, id: Name("x"), ctx: Load, @@ -1213,7 +1213,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 729..730, id: Name("f"), ctx: Store, @@ -1223,10 +1223,10 @@ Module( }, WithItem { range: 732..733, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 732..733, id: Name("y"), ctx: Load, @@ -1240,11 +1240,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 738..744, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 738..739, id: Name("f"), ctx: Store, @@ -1252,7 +1252,7 @@ Module( ), annotation: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 741..744, }, ), @@ -1262,20 +1262,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 745..777, is_async: false, items: [ WithItem { range: 750..771, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 750..766, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 751..752, id: Name("x"), ctx: Load, @@ -1284,10 +1284,10 @@ Module( generators: [ Comprehension { range: 753..766, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 757..758, id: Name("x"), ctx: Store, @@ -1295,7 +1295,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 762..766, id: Name("iter"), ctx: Load, @@ -1311,7 +1311,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 770..771, id: Name("y"), ctx: Store, @@ -1323,11 +1323,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 774..777, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 774..777, }, ), @@ -1338,16 +1338,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 837..854, is_async: false, items: [ WithItem { range: 843..853, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 844..848, id: Name("item"), ctx: Load, @@ -1356,7 +1356,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 852..853, id: Name("f"), ctx: Store, @@ -1370,11 +1370,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 857..860, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 857..860, }, ), @@ -1382,16 +1382,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 862..878, is_async: false, items: [ WithItem { range: 868..877, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 868..872, id: Name("item"), ctx: Load, @@ -1400,7 +1400,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 876..877, id: Name("f"), ctx: Store, @@ -1414,11 +1414,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 880..886, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 880..881, id: Name("x"), ctx: Store, @@ -1426,7 +1426,7 @@ Module( ), annotation: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 883..886, }, ), @@ -1436,16 +1436,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 887..904, is_async: false, items: [ WithItem { range: 893..903, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 893..897, id: Name("item"), ctx: Load, @@ -1454,7 +1454,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 901..903, id: Name("f1"), ctx: Store, @@ -1468,11 +1468,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 908..915, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 908..910, id: Name("f2"), ctx: Store, @@ -1480,7 +1480,7 @@ Module( ), annotation: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 912..915, }, ), @@ -1490,16 +1490,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 916..950, is_async: false, items: [ WithItem { range: 922..932, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 922..927, id: Name("item1"), ctx: Load, @@ -1508,7 +1508,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 931..932, id: Name("f"), ctx: Store, @@ -1518,14 +1518,14 @@ Module( }, WithItem { range: 934..944, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 934..944, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 934..939, id: Name("item2"), ctx: Store, @@ -1533,7 +1533,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 943..944, value: Int( 0, @@ -1548,11 +1548,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 947..950, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 947..950, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap index 1798ad6c23..6b0b38c2e3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap @@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/with/empty_wi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..105, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..98, is_async: false, items: [], body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..98, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..98, }, ), @@ -34,15 +34,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..105, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..105, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, id: Name("x"), ctx: Load, @@ -51,7 +51,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap index 15bb2f058b..9c651474b8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/with/unclosed ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, is_async: false, items: [ WithItem { range: 5..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..6, id: Name(""), ctx: Invalid, @@ -33,15 +33,15 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..14, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..14, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, id: Name("x"), ctx: Load, @@ -50,7 +50,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap index ce5678ded9..317469f900 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/with/unclosed ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, is_async: false, items: [ WithItem { range: 5..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..6, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap index c93979143a..7e2d808bc6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/invalid/statements/with/unparent ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..249, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..102, is_async: false, items: [ WithItem { range: 91..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..95, id: Name("item"), ctx: Load, @@ -33,7 +33,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..102, }, ), @@ -42,16 +42,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..124, is_async: false, items: [ WithItem { range: 108..117, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..112, id: Name("item"), ctx: Load, @@ -60,7 +60,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..117, id: Name("x"), ctx: Store, @@ -72,7 +72,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..124, }, ), @@ -81,20 +81,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..141, is_async: false, items: [ WithItem { range: 130..135, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..135, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..135, id: Name("item"), ctx: Load, @@ -109,7 +109,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..141, }, ), @@ -118,20 +118,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..163, is_async: false, items: [ WithItem { range: 147..157, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..152, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..152, id: Name("item"), ctx: Load, @@ -143,7 +143,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..157, id: Name("x"), ctx: Store, @@ -155,7 +155,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..163, }, ), @@ -164,20 +164,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..193, is_async: false, items: [ WithItem { range: 169..175, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..175, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..175, id: Name("item1"), ctx: Load, @@ -190,10 +190,10 @@ Module( }, WithItem { range: 177..187, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..182, id: Name("item2"), ctx: Load, @@ -202,7 +202,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..187, id: Name("f"), ctx: Store, @@ -214,7 +214,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..193, }, ), @@ -223,16 +223,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..223, is_async: false, items: [ WithItem { range: 199..209, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..204, id: Name("item1"), ctx: Load, @@ -241,7 +241,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..209, id: Name("f"), ctx: Store, @@ -251,14 +251,14 @@ Module( }, WithItem { range: 211..217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..217, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 212..217, id: Name("item2"), ctx: Load, @@ -273,7 +273,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..223, }, ), @@ -282,16 +282,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..249, is_async: false, items: [ WithItem { range: 229..233, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 229..233, id: Name("item"), ctx: Load, @@ -301,10 +301,10 @@ Module( }, WithItem { range: 237..243, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 237..238, value: Int( 0, @@ -314,7 +314,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..243, id: Name("f"), ctx: Store, @@ -326,7 +326,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..249, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap index 6fade07f51..e1c3d47bda 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap @@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_empty_expres ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..58, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..49, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..49, value: TStringValue { inner: Single( TString { range: 44..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 46..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..47, id: Name(""), ctx: Invalid, @@ -56,25 +56,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..57, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..57, value: TStringValue { inner: Single( TString { range: 50..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 52..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..53, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap index 4666c540d1..6b648bae65 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap @@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_invalid_conv ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..53, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..52, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..52, value: TStringValue { inner: Single( TString { range: 44..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 46..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap index def26a3f18..9c937acac3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap @@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_invalid_conv ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..66, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..54, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..54, value: TStringValue { inner: Single( TString { range: 44..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 46..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Load, @@ -56,25 +56,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..65, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..65, value: TStringValue { inner: Single( TString { range: 55..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 57..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..59, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap index ea5934128b..592c6eedce 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap @@ -7,34 +7,34 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_invalid_star ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..156, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..127, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..127, value: TStringValue { inner: Single( TString { range: 121..127, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 123..126, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..125, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..125, id: Name(""), ctx: Invalid, @@ -63,35 +63,35 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..141, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..141, value: TStringValue { inner: Single( TString { range: 128..141, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 130..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..139, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..139, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, id: Name("x"), ctx: Load, @@ -99,7 +99,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 138..139, id: Name("y"), ctx: Load, @@ -131,34 +131,34 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..155, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..155, value: TStringValue { inner: Single( TString { range: 142..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 144..154, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..153, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..153, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..153, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap index ceeb8540da..d0d8abdfd3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap @@ -7,49 +7,47 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_lambda_witho ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..61, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..60, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..60, value: TStringValue { inner: Single( TString { range: 44..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 46..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..56, parameters: Some( Parameters { range: 54..55, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -63,7 +61,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..56, id: Name(""), ctx: Invalid, @@ -79,7 +77,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 56..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " x", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap index 3078488a98..4218d6845d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap @@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_unclosed_lbr ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..82, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..48, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..48, value: TStringValue { inner: Single( TString { range: 44..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 46..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..47, id: Name(""), ctx: Invalid, @@ -56,25 +56,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..58, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..58, value: TStringValue { inner: Single( TString { range: 49..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 51..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..55, id: Name("foo"), ctx: Load, @@ -100,25 +100,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..67, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..67, value: TStringValue { inner: Single( TString { range: 59..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 61..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..65, id: Name("foo"), ctx: Load, @@ -149,26 +149,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..81, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..81, value: TStringValue { inner: Concatenated( [ TString { range: 68..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 70..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..71, id: Name(""), ctx: Invalid, @@ -188,15 +188,15 @@ Module( }, TString { range: 73..81, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 77..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..78, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap index 0a7f827af2..3a002658cc 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap @@ -7,37 +7,37 @@ input_file: crates/ruff_python_parser/resources/inline/err/t_string_unclosed_lbr ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..73, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..56, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..56, value: TStringValue { inner: Single( TString { range: 44..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 46..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello ", }, ), Interpolation( InterpolatedElement { range: 52..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, id: Name("x"), ctx: Load, @@ -48,7 +48,7 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 55..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], }, ), @@ -69,32 +69,32 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..72, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..72, value: TStringValue { inner: Single( TString { range: 57..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 59..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello ", }, ), Interpolation( InterpolatedElement { range: 65..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, id: Name("x"), ctx: Load, @@ -105,12 +105,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 68..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 68..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap index 8767d279bf..b631879119 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap @@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/template_strings_py31 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..89, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..52, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..52, value: TStringValue { inner: Single( TString { range: 44..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 46..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..50, id: Name("hey"), ctx: Load, @@ -56,25 +56,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..63, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..63, value: TStringValue { inner: Single( TString { range: 53..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 55..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..61, id: Name("there"), ctx: Load, @@ -100,22 +100,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..88, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..88, value: TStringValue { inner: Single( TString { range: 64..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 68..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "what's\nhappening?", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap index 81e4bacde6..0bcf4355aa 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/try_stmt_invalid_orde ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..47, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..31, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -27,7 +27,7 @@ Module( finalbody: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..31, }, ), @@ -37,7 +37,7 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..46, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap index b86a2ad5bf..cdba080314 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/try_stmt_missing_exce ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..43, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -30,12 +30,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..42, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..27, }, ), @@ -44,7 +44,7 @@ Module( orelse: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..42, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap index 2bb1a1e828..1803efb100 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/try_stmt_misspelled_e ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..165, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -30,11 +30,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..20, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..19, id: Name("exept"), ctx: Store, @@ -42,7 +42,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..20, id: Name(""), ctx: Invalid, @@ -54,24 +54,24 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..58, }, ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..76, }, ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..82, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("a"), ctx: Store, @@ -80,7 +80,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, value: Int( 1, @@ -91,12 +91,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..113, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..96, }, ), @@ -105,13 +105,13 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 97..113, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..113, }, ), @@ -126,11 +126,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..120, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..119, id: Name("exept"), ctx: Store, @@ -138,7 +138,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..120, id: Name(""), ctx: Invalid, @@ -150,18 +150,18 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..158, }, ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..164, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..160, id: Name("b"), ctx: Store, @@ -170,7 +170,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..164, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap index 689c42622e..98f032e8c9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/try_stmt_mixed_except ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..242, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..63, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -26,13 +26,13 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 14..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..30, }, ), @@ -42,11 +42,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 31..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..53, id: Name("ExceptionGroup"), ctx: Load, @@ -57,7 +57,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..63, }, ), @@ -72,12 +72,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..127, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..77, }, ), @@ -86,11 +86,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 78..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..100, id: Name("ExceptionGroup"), ctx: Load, @@ -101,7 +101,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..110, }, ), @@ -111,13 +111,13 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 111..127, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..127, }, ), @@ -132,12 +132,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..241, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..141, }, ), @@ -146,13 +146,13 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 142..158, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..158, }, ), @@ -162,13 +162,13 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 159..175, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..175, }, ), @@ -178,11 +178,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 176..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 184..198, id: Name("ExceptionGroup"), ctx: Load, @@ -193,7 +193,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..208, }, ), @@ -203,11 +203,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 209..241, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..231, id: Name("ExceptionGroup"), ctx: Load, @@ -218,7 +218,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 237..241, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap index b0c18e8a43..88c24c6972 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/tuple_context_manager ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..327, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 216..236, is_async: false, items: [ WithItem { range: 222..225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..225, id: Name("foo"), ctx: Load, @@ -31,10 +31,10 @@ Module( }, WithItem { range: 227..230, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..230, id: Name("bar"), ctx: Load, @@ -46,11 +46,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..236, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..236, }, ), @@ -61,20 +61,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 237..274, is_async: false, items: [ WithItem { range: 242..269, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..261, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..250, id: Name("open"), ctx: Load, @@ -82,17 +82,17 @@ Module( ), arguments: Arguments { range: 250..261, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 251..260, value: StringLiteralValue { inner: Single( StringLiteral { range: 251..260, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo.txt", flags: StringLiteralFlags { quote_style: Single, @@ -112,7 +112,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 266..269, id: Name("foo"), ctx: Store, @@ -124,11 +124,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..274, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..274, }, ), @@ -139,16 +139,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 275..309, is_async: false, items: [ WithItem { range: 284..287, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 284..287, id: Name("foo"), ctx: Load, @@ -158,10 +158,10 @@ Module( }, WithItem { range: 291..294, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 291..294, id: Name("bar"), ctx: Load, @@ -171,10 +171,10 @@ Module( }, WithItem { range: 298..301, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 298..301, id: Name("baz"), ctx: Load, @@ -186,11 +186,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..309, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..309, }, ), @@ -201,16 +201,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..326, is_async: false, items: [ WithItem { range: 316..319, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 316..319, id: Name("foo"), ctx: Load, @@ -222,11 +222,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 323..326, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 323..326, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap index 96e430a647..b035de8a7f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_alias_incomplete ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..21, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("type"), ctx: Load, @@ -26,11 +26,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..9, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..9, id: Name("type"), ctx: Load, @@ -40,11 +40,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("x"), ctx: Load, @@ -54,11 +54,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..20, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("x"), ctx: Store, @@ -67,7 +67,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..20, id: Name(""), ctx: Invalid, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap index a7f11501f6..57d354e2fd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_alias_invalid_va ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..67, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Store, @@ -25,11 +25,11 @@ Module( type_params: None, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..11, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("y"), ctx: Load, @@ -42,11 +42,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..28, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("x"), ctx: Store, @@ -55,12 +55,12 @@ Module( type_params: None, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..28, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("y"), ctx: Load, @@ -73,11 +73,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..50, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("x"), ctx: Store, @@ -86,11 +86,11 @@ Module( type_params: None, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..50, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, id: Name("y"), ctx: Load, @@ -102,11 +102,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..61, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("x"), ctx: Store, @@ -115,7 +115,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("x"), ctx: Load, @@ -125,11 +125,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap index c9de513d8a..60ecaa07d2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_default_py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..149, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..65, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, id: Name("X"), ctx: Store, @@ -25,22 +25,22 @@ Module( type_params: Some( TypeParams { range: 50..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 51..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 51..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..58, id: Name("int"), ctx: Load, @@ -54,7 +54,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..65, id: Name("int"), ctx: Load, @@ -64,34 +64,34 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..87, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 70..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 71..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 72..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 72..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..79, id: Name("int"), ctx: Load, @@ -105,9 +105,7 @@ Module( ), parameters: Parameters { range: 80..82, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -118,11 +116,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..87, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..87, }, ), @@ -133,33 +131,33 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..111, decorator_list: [], name: Identifier { id: Name("C"), range: 94..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 95..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 96..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 96..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..103, id: Name("int"), ctx: Load, @@ -174,7 +172,7 @@ Module( arguments: Some( Arguments { range: 104..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -182,11 +180,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..111, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..111, }, ), @@ -197,27 +195,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..148, decorator_list: [], name: Identifier { id: Name("D"), range: 118..119, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 119..141, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 120..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("S"), range: 120..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -226,17 +224,17 @@ Module( TypeVar( TypeParamTypeVar { range: 123..130, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 123..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..130, id: Name("int"), ctx: Load, @@ -248,17 +246,17 @@ Module( TypeVar( TypeParamTypeVar { range: 132..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("U"), range: 132..133, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..140, id: Name("uint"), ctx: Load, @@ -273,7 +271,7 @@ Module( arguments: Some( Arguments { range: 141..143, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -281,11 +279,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..148, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..148, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap index ce4ecda18c..46a51aa71b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_invalid_bo ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..103, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..21, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,25 +25,25 @@ Module( type_params: Some( TypeParams { range: 6..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 7..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..14, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..14, id: Name("int"), ctx: Load, @@ -61,7 +61,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..21, id: Name("int"), ctx: Load, @@ -71,11 +71,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..46, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("X"), ctx: Store, @@ -84,26 +84,26 @@ Module( type_params: Some( TypeParams { range: 28..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 29..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..39, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("x"), ctx: Load, @@ -121,7 +121,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..46, id: Name("int"), ctx: Load, @@ -131,11 +131,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..76, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, id: Name("X"), ctx: Store, @@ -144,25 +144,25 @@ Module( type_params: Some( TypeParams { range: 53..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 54..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..69, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Load, @@ -179,7 +179,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..76, id: Name("int"), ctx: Load, @@ -189,11 +189,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..102, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, id: Name("X"), ctx: Store, @@ -202,21 +202,21 @@ Module( type_params: Some( TypeParams { range: 83..96, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 84..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 84..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..88, id: Name("x"), ctx: Load, @@ -229,11 +229,11 @@ Module( TypeVar( TypeParamTypeVar { range: 92..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("int"), range: 92..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -244,7 +244,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..102, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap index 84551e10b6..91001fe28b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_missing_bo ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..41, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,16 +25,16 @@ Module( type_params: Some( TypeParams { range: 6..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 7..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -45,7 +45,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("int"), ctx: Load, @@ -55,11 +55,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..40, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("X"), ctx: Store, @@ -68,16 +68,16 @@ Module( type_params: Some( TypeParams { range: 24..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 25..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T1"), range: 25..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -86,11 +86,11 @@ Module( TypeVar( TypeParamTypeVar { range: 31..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T2"), range: 31..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -101,7 +101,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..40, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap index 7b4e3d833c..cdda1b6d5c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_param_spec ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..23, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,16 +25,16 @@ Module( type_params: Some( TypeParams { range: 6..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 7..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 9..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -44,7 +44,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..10, id: Name(""), ctx: Invalid, @@ -54,11 +54,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, id: Name("int"), ctx: Load, @@ -68,11 +68,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap index 6cde8b6197..01b78df9f6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_param_spec ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..140, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,25 +25,25 @@ Module( type_params: Some( TypeParams { range: 6..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 7..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 9..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..17, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("int"), ctx: Load, @@ -60,7 +60,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, id: Name("int"), ctx: Load, @@ -70,11 +70,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..52, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..31, id: Name("X"), ctx: Store, @@ -83,26 +83,26 @@ Module( type_params: Some( TypeParams { range: 31..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 32..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 34..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..45, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, id: Name("x"), ctx: Load, @@ -119,7 +119,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, id: Name("int"), ctx: Load, @@ -129,11 +129,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..85, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..59, id: Name("X"), ctx: Store, @@ -142,25 +142,25 @@ Module( type_params: Some( TypeParams { range: 59..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 60..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 62..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..78, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("x"), ctx: Load, @@ -176,7 +176,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..85, id: Name("int"), ctx: Load, @@ -186,11 +186,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..114, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..92, id: Name("X"), ctx: Store, @@ -199,21 +199,21 @@ Module( type_params: Some( TypeParams { range: 92..108, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 93..100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 95..96, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, id: Name("x"), ctx: Load, @@ -225,11 +225,11 @@ Module( TypeVar( TypeParamTypeVar { range: 104..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("int"), range: 104..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -240,7 +240,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..114, id: Name("int"), ctx: Load, @@ -250,11 +250,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..139, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..121, id: Name("X"), ctx: Store, @@ -263,25 +263,25 @@ Module( type_params: Some( TypeParams { range: 121..133, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 122..132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 124..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..132, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..132, id: Name("int"), ctx: Load, @@ -298,7 +298,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..139, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap index ce7099a5e3..1a9ac4c029 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_param_spec ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..44, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,16 +25,16 @@ Module( type_params: Some( TypeParams { range: 6..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 7..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 9..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -44,7 +44,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..19, id: Name("int"), ctx: Load, @@ -54,11 +54,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..43, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, id: Name("X"), ctx: Store, @@ -67,16 +67,16 @@ Module( type_params: Some( TypeParams { range: 26..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 27..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -84,11 +84,11 @@ Module( TypeVar( TypeParamTypeVar { range: 34..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T2"), range: 34..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -99,7 +99,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..43, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap index 17ce8c72fd..d8b0ce565c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_type_var_i ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..163, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,26 +25,26 @@ Module( type_params: Some( TypeParams { range: 6..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 7..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..15, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, id: Name("int"), ctx: Load, @@ -61,7 +61,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, id: Name("int"), ctx: Load, @@ -71,11 +71,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..48, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, id: Name("X"), ctx: Store, @@ -84,27 +84,27 @@ Module( type_params: Some( TypeParams { range: 29..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 30..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 30..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..41, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("x"), ctx: Load, @@ -121,7 +121,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..48, id: Name("int"), ctx: Load, @@ -131,11 +131,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..76, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, id: Name("X"), ctx: Store, @@ -144,27 +144,27 @@ Module( type_params: Some( TypeParams { range: 55..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 56..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..68, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..68, id: Name("x"), ctx: Load, @@ -181,7 +181,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..76, id: Name("int"), ctx: Load, @@ -191,11 +191,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..107, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, id: Name("X"), ctx: Store, @@ -204,26 +204,26 @@ Module( type_params: Some( TypeParams { range: 83..101, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 84..100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 84..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..100, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, id: Name("x"), ctx: Load, @@ -239,7 +239,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..107, id: Name("int"), ctx: Load, @@ -249,11 +249,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..134, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..114, id: Name("X"), ctx: Store, @@ -262,22 +262,22 @@ Module( type_params: Some( TypeParams { range: 114..128, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 115..120, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 115..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, id: Name("x"), ctx: Load, @@ -289,11 +289,11 @@ Module( TypeVar( TypeParamTypeVar { range: 124..127, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("int"), range: 124..127, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -304,7 +304,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..134, id: Name("int"), ctx: Load, @@ -314,11 +314,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..162, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..141, id: Name("X"), ctx: Store, @@ -327,21 +327,21 @@ Module( type_params: Some( TypeParams { range: 141..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 142..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 142..143, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..148, id: Name("int"), ctx: Load, @@ -351,11 +351,11 @@ Module( default: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..155, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..155, id: Name("int"), ctx: Load, @@ -372,7 +372,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..162, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap index 5ad35632e6..1ecc4bfb34 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_type_var_m ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..64, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,16 +25,16 @@ Module( type_params: Some( TypeParams { range: 6..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 7..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -45,7 +45,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("int"), ctx: Load, @@ -55,11 +55,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..40, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("X"), ctx: Store, @@ -68,21 +68,21 @@ Module( type_params: Some( TypeParams { range: 24..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 25..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 25..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..31, id: Name("int"), ctx: Load, @@ -97,7 +97,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..40, id: Name("int"), ctx: Load, @@ -107,11 +107,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..63, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, id: Name("X"), ctx: Store, @@ -120,16 +120,16 @@ Module( type_params: Some( TypeParams { range: 47..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 48..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T1"), range: 48..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -138,11 +138,11 @@ Module( TypeVar( TypeParamTypeVar { range: 54..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T2"), range: 54..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -153,7 +153,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap index 3ffc891d81..1f30abc277 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_type_var_t ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,16 +25,16 @@ Module( type_params: Some( TypeParams { range: 6..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 7..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -44,7 +44,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..9, id: Name(""), ctx: Invalid, @@ -54,11 +54,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..14, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..14, id: Name("int"), ctx: Load, @@ -68,11 +68,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..21, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..21, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap index c6ab71d84f..8e8de2e274 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_type_var_t ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..147, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,25 +25,25 @@ Module( type_params: Some( TypeParams { range: 6..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 7..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..17, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("int"), ctx: Load, @@ -60,7 +60,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, id: Name("int"), ctx: Load, @@ -70,11 +70,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..56, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..31, id: Name("X"), ctx: Store, @@ -83,31 +83,31 @@ Module( type_params: Some( TypeParams { range: 31..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 32..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 33..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..49, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..49, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, id: Name("int"), ctx: Load, @@ -115,7 +115,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..49, id: Name("str"), ctx: Load, @@ -135,7 +135,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, id: Name("int"), ctx: Load, @@ -145,11 +145,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..84, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("X"), ctx: Store, @@ -158,26 +158,26 @@ Module( type_params: Some( TypeParams { range: 63..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 64..77, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 65..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..77, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..77, id: Name("x"), ctx: Load, @@ -194,7 +194,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, id: Name("int"), ctx: Load, @@ -204,11 +204,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..117, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("X"), ctx: Store, @@ -217,25 +217,25 @@ Module( type_params: Some( TypeParams { range: 91..111, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 92..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 93..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..110, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..110, id: Name("x"), ctx: Load, @@ -251,7 +251,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..117, id: Name("int"), ctx: Load, @@ -261,11 +261,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..146, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..124, id: Name("X"), ctx: Store, @@ -274,21 +274,21 @@ Module( type_params: Some( TypeParams { range: 124..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 125..132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 126..128, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..132, id: Name("x"), ctx: Load, @@ -300,11 +300,11 @@ Module( TypeVar( TypeParamTypeVar { range: 136..139, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("int"), range: 136..139, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -315,7 +315,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..146, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap index b7e862a105..fb3c198af0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_param_type_var_t ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..44, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,16 +25,16 @@ Module( type_params: Some( TypeParams { range: 6..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 7..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -44,7 +44,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..19, id: Name("int"), ctx: Load, @@ -54,11 +54,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..43, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, id: Name("X"), ctx: Store, @@ -67,16 +67,16 @@ Module( type_params: Some( TypeParams { range: 26..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 27..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 28..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -84,11 +84,11 @@ Module( TypeVar( TypeParamTypeVar { range: 34..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T2"), range: 34..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -99,7 +99,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..43, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap index fd3e6b168f..967dce60f4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap @@ -7,32 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_params_empty.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..52, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..21, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 7..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [], }, ), parameters: Parameters { range: 9..11, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -43,7 +41,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..21, }, ), @@ -52,11 +50,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..51, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..36, id: Name("ListOrSet"), ctx: Store, @@ -65,17 +63,17 @@ Module( type_params: Some( TypeParams { range: 36..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [], }, ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..51, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..45, id: Name("list"), ctx: Load, @@ -84,7 +82,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..51, id: Name("set"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap index df2f28b34d..05bad9f457 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/type_stmt_py311.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..57, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..56, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, id: Name("x"), ctx: Store, @@ -25,7 +25,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap index cbeb13482f..15c59e5cca 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/unparenthesized_named ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..53, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..52, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..52, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..46, id: Name("lst"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), slice: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..51, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Store, @@ -40,7 +40,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..51, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap index abbb6e06fa..f907721b0f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/err/unparenthesized_named ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..73, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..72, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..72, elt: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..53, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..48, id: Name("last"), ctx: Store, @@ -32,7 +32,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, id: Name("x"), ctx: Load, @@ -43,10 +43,10 @@ Module( generators: [ Comprehension { range: 54..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..59, id: Name("x"), ctx: Store, @@ -54,11 +54,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..71, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..68, id: Name("range"), ctx: Load, @@ -66,11 +66,11 @@ Module( ), arguments: Arguments { range: 68..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..70, value: Int( 3, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap index 16c0b89b53..bf277fe095 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap @@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/err/unparenthesized_named ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..88, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..57, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..57, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..50, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, id: Name("x"), ctx: Store, @@ -33,7 +33,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, value: Int( 1, @@ -44,7 +44,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, value: Int( 2, @@ -53,7 +53,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, value: Int( 3, @@ -67,16 +67,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..72, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..72, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, value: Int( 1, @@ -85,11 +85,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..68, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("x"), ctx: Store, @@ -97,7 +97,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..68, value: Int( 2, @@ -108,7 +108,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, value: Int( 3, @@ -122,16 +122,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..87, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..87, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, value: Int( 1, @@ -140,7 +140,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, value: Int( 2, @@ -149,11 +149,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..86, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..81, id: Name("x"), ctx: Store, @@ -161,7 +161,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..86, value: Int( 3, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap index f02e2c45bd..096671b850 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap @@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/inline/err/unterminated_fstring_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..67, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: FStringValue { inner: Single( FString( FString { range: 0..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: FStringFlags { quote_style: Double, @@ -40,15 +40,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..13, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..13, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, value: Int( 1, @@ -58,7 +58,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..13, value: Int( 1, @@ -71,33 +71,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..24, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..24, value: FStringValue { inner: Single( FString( FString { range: 14..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 16..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello ", }, ), Interpolation( InterpolatedElement { range: 22..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("x"), ctx: Load, @@ -124,15 +124,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..30, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..30, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, value: Int( 2, @@ -142,7 +142,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, value: Int( 2, @@ -155,33 +155,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..42, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..42, value: FStringValue { inner: Single( FString( FString { range: 31..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 33..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello ", }, ), Interpolation( InterpolatedElement { range: 39..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("x"), ctx: Load, @@ -192,7 +192,7 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 42..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], }, ), @@ -214,15 +214,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..48, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..48, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, value: Int( 3, @@ -232,7 +232,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, value: Int( 3, @@ -245,33 +245,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..60, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..60, value: FStringValue { inner: Single( FString( FString { range: 49..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 51..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello ", }, ), Interpolation( InterpolatedElement { range: 57..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..59, id: Name("x"), ctx: Load, @@ -298,15 +298,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..66, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..66, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..62, value: Int( 4, @@ -316,7 +316,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, value: Int( 4, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap index 9949fa6cbc..dc64a3105d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/walrus_py37.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..54, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..53, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..52, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, id: Name("x"), ctx: Store, @@ -28,7 +28,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap index 4f87608d79..0af23c288c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/while_stmt_invalid_te ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..70, body: [ While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, test: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..8, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("x"), ctx: Load, @@ -32,11 +32,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..13, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..13, }, ), @@ -48,16 +48,16 @@ Module( ), While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..32, test: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..27, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("x"), ctx: Load, @@ -69,11 +69,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, }, ), @@ -85,11 +85,11 @@ Module( ), While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..40, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("a"), ctx: Load, @@ -101,11 +101,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..48, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, id: Name("b"), ctx: Store, @@ -113,7 +113,7 @@ Module( ), annotation: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..48, }, ), @@ -123,15 +123,15 @@ Module( ), While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..61, test: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..61, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, id: Name("a"), ctx: Store, @@ -139,7 +139,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, value: Int( 1, @@ -154,11 +154,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..69, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, id: Name("b"), ctx: Store, @@ -166,7 +166,7 @@ Module( ), annotation: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..69, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap index 7006daf690..67fb75a824 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/err/while_stmt_missing_co ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..40, body: [ While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..39, test: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..18, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..13, id: Name("a"), ctx: Load, @@ -32,7 +32,7 @@ Module( comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..18, value: Int( 30, @@ -45,7 +45,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..39, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap index e86db412de..be86004a04 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/err/while_stmt_missing_te ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..30, body: [ While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..5, id: Name(""), ctx: Invalid, @@ -25,11 +25,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..11, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..11, }, ), @@ -41,11 +41,11 @@ Module( ), While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..29, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..17, id: Name(""), ctx: Invalid, @@ -54,12 +54,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..29, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("a"), ctx: Store, @@ -68,7 +68,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap index 8a24d7009d..668c7c2c08 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/with_items_parenthesi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..57, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..56, is_async: false, items: [ WithItem { range: 34..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..39, id: Name("item1"), ctx: Load, @@ -31,10 +31,10 @@ Module( }, WithItem { range: 41..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..46, id: Name("item2"), ctx: Load, @@ -46,7 +46,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..56, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap index 7a3cf04fb1..ea060453a9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/err/with_items_parenthesi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..160, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..23, is_async: false, items: [ WithItem { range: 6..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..11, id: Name("item1"), ctx: Load, @@ -31,10 +31,10 @@ Module( }, WithItem { range: 12..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..17, id: Name("item2"), ctx: Load, @@ -46,11 +46,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, }, ), @@ -61,16 +61,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..53, is_async: false, items: [ WithItem { range: 30..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..35, id: Name("item1"), ctx: Load, @@ -79,7 +79,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..41, id: Name("f1"), ctx: Store, @@ -89,10 +89,10 @@ Module( }, WithItem { range: 42..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..47, id: Name("item2"), ctx: Load, @@ -104,11 +104,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..53, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..53, }, ), @@ -119,16 +119,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..91, is_async: false, items: [ WithItem { range: 60..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..65, id: Name("item1"), ctx: Load, @@ -138,10 +138,10 @@ Module( }, WithItem { range: 67..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..72, id: Name("item2"), ctx: Load, @@ -151,10 +151,10 @@ Module( }, WithItem { range: 73..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..78, id: Name("item3"), ctx: Load, @@ -164,10 +164,10 @@ Module( }, WithItem { range: 80..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..85, id: Name("item4"), ctx: Load, @@ -179,11 +179,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..91, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..91, }, ), @@ -194,16 +194,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..135, is_async: false, items: [ WithItem { range: 98..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..103, id: Name("item1"), ctx: Load, @@ -213,10 +213,10 @@ Module( }, WithItem { range: 105..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..110, id: Name("item2"), ctx: Load, @@ -225,7 +225,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..116, id: Name("f1"), ctx: Store, @@ -235,10 +235,10 @@ Module( }, WithItem { range: 117..122, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..122, id: Name("item3"), ctx: Load, @@ -248,10 +248,10 @@ Module( }, WithItem { range: 124..129, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..129, id: Name("item4"), ctx: Load, @@ -263,11 +263,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..135, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..135, }, ), @@ -278,21 +278,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..159, is_async: false, items: [ WithItem { range: 141..154, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..154, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..147, id: Name("item1"), ctx: Load, @@ -300,7 +300,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..154, id: Name("item2"), ctx: Load, @@ -317,11 +317,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..159, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..159, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap index cf762a1792..cb9bd384b5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/err/write_to_debug_expr.p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..83, body: [ Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..13, id: Name("__debug__"), ctx: Del, @@ -28,12 +28,12 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..36, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("x"), ctx: Del, @@ -41,7 +41,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, id: Name("y"), ctx: Del, @@ -49,7 +49,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..33, id: Name("__debug__"), ctx: Del, @@ -57,7 +57,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("z"), ctx: Del, @@ -68,12 +68,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..50, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..46, id: Name("__debug__"), ctx: Store, @@ -82,7 +82,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, value: Int( 1, @@ -93,17 +93,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..82, targets: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..69, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, id: Name("x"), ctx: Store, @@ -111,7 +111,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, id: Name("y"), ctx: Store, @@ -119,7 +119,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..66, id: Name("__debug__"), ctx: Store, @@ -127,7 +127,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("z"), ctx: Store, @@ -141,12 +141,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..82, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, value: Int( 1, @@ -155,7 +155,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, value: Int( 2, @@ -164,7 +164,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, value: Int( 3, @@ -173,7 +173,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, value: Int( 4, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap index 411a58148d..7982e188e2 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/all_async_comprehensio ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..126, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..125, is_async: true, decorator_list: [], name: Identifier { id: Name("test"), range: 54..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 58..60, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,20 +35,20 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..125, value: Some( ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..125, elt: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..100, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, id: Name("x"), ctx: Load, @@ -59,10 +57,10 @@ Module( generators: [ Comprehension { range: 73..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, id: Name("x"), ctx: Store, @@ -70,11 +68,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..99, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..96, id: Name("elements"), ctx: Load, @@ -82,11 +80,11 @@ Module( ), arguments: Arguments { range: 96..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, id: Name("n"), ctx: Load, @@ -106,10 +104,10 @@ Module( generators: [ Comprehension { range: 101..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..112, id: Name("n"), ctx: Store, @@ -117,11 +115,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..124, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..121, id: Name("range"), ctx: Load, @@ -129,11 +127,11 @@ Module( ), arguments: Arguments { range: 121..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, value: Int( 3, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap index 40c7d68cfd..0e73bb0c25 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap @@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/inline/ok/ambiguous_lpar_with_it ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..337, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..143, is_async: false, items: [ WithItem { range: 129..138, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..138, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..131, id: Name("a"), ctx: Load, @@ -35,7 +35,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..138, id: Name("b"), ctx: Load, @@ -50,11 +50,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..143, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..143, }, ), @@ -65,20 +65,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..166, is_async: false, items: [ WithItem { range: 149..161, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..161, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..151, id: Name("a"), ctx: Load, @@ -90,7 +90,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..161, id: Name("b"), ctx: Load, @@ -105,11 +105,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..166, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..166, }, ), @@ -120,22 +120,22 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..220, is_async: false, items: [ WithItem { range: 201..215, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..215, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..203, id: Name("a"), ctx: Load, @@ -143,13 +143,13 @@ Module( ), BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..215, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..209, id: Name("b"), ctx: Load, @@ -157,7 +157,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..215, id: Name("c"), ctx: Load, @@ -175,11 +175,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..220, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..220, }, ), @@ -190,28 +190,28 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..245, is_async: false, items: [ WithItem { range: 226..240, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..240, op: Or, values: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..235, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..228, id: Name("a"), ctx: Load, @@ -219,7 +219,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..235, id: Name("b"), ctx: Load, @@ -230,7 +230,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..240, id: Name("c"), ctx: Load, @@ -245,11 +245,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..245, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..245, }, ), @@ -260,28 +260,28 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..272, is_async: false, items: [ WithItem { range: 251..267, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 251..267, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 251..263, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 252..257, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 252..253, id: Name("a"), ctx: Load, @@ -290,7 +290,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 256..257, id: Name("b"), ctx: Load, @@ -301,7 +301,7 @@ Module( op: LShift, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 262..263, id: Name("c"), ctx: Load, @@ -312,7 +312,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 266..267, id: Name("d"), ctx: Load, @@ -326,11 +326,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..272, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..272, }, ), @@ -341,24 +341,24 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..336, is_async: false, items: [ WithItem { range: 317..331, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..331, left: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..323, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 318..319, id: Name("a"), ctx: Load, @@ -366,7 +366,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..322, value: Int( 0, @@ -379,11 +379,11 @@ Module( op: Add, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 326..331, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 326..327, id: Name("b"), ctx: Load, @@ -392,7 +392,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 330..331, id: Name("c"), ctx: Load, @@ -408,11 +408,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 333..336, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 333..336, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap index 00a32e1ab3..d035e3bff6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap @@ -7,32 +7,32 @@ input_file: crates/ruff_python_parser/resources/inline/ok/ambiguous_lpar_with_it ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..153, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, is_async: false, items: [ WithItem { range: 5..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..23, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..16, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -40,7 +40,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("y"), ctx: Load, @@ -54,11 +54,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, }, ), @@ -69,31 +69,31 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..71, is_async: false, items: [ WithItem { range: 34..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..66, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..59, value: true, }, ), body: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..51, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("x"), ctx: Load, @@ -102,10 +102,10 @@ Module( generators: [ Comprehension { range: 37..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("x"), ctx: Store, @@ -113,7 +113,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..50, id: Name("iter"), ctx: Load, @@ -128,7 +128,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, id: Name("y"), ctx: Load, @@ -142,11 +142,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..71, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..71, }, ), @@ -157,31 +157,31 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..120, is_async: false, items: [ WithItem { range: 77..115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..115, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..108, value: true, }, ), body: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..100, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, id: Name("x"), ctx: Load, @@ -190,10 +190,10 @@ Module( generators: [ Comprehension { range: 80..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("x"), ctx: Store, @@ -201,7 +201,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..99, id: Name("iter"), ctx: Load, @@ -216,7 +216,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..115, id: Name("y"), ctx: Load, @@ -230,11 +230,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..120, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..120, }, ), @@ -245,31 +245,31 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..152, is_async: false, items: [ WithItem { range: 126..147, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..147, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..140, value: true, }, ), body: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..132, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("x"), ctx: Load, @@ -277,7 +277,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..131, value: Int( 0, @@ -289,7 +289,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, id: Name("y"), ctx: Load, @@ -303,11 +303,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..152, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..152, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap index c0dc9bb148..36a6809370 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/ann_assign_stmt_simple ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..45, body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("a"), ctx: Store, @@ -24,7 +24,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("int"), ctx: Load, @@ -36,11 +36,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..25, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("a"), ctx: Store, @@ -48,7 +48,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, id: Name("int"), ctx: Load, @@ -60,15 +60,15 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..34, target: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("a"), ctx: Load, @@ -77,14 +77,14 @@ Module( attr: Identifier { id: Name("b"), range: 28..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Store, }, ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, id: Name("int"), ctx: Load, @@ -96,15 +96,15 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..44, target: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..39, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("a"), ctx: Load, @@ -112,7 +112,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, value: Int( 0, @@ -124,7 +124,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..44, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap index 650a3b6e53..495601cfa5 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/args_unparenthesized_g ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..107, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..51, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..51, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, id: Name("zip"), ctx: Load, @@ -28,15 +28,15 @@ Module( ), arguments: Arguments { range: 3..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..26, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("x"), ctx: Load, @@ -45,10 +45,10 @@ Module( generators: [ Comprehension { range: 7..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, id: Name("x"), ctx: Store, @@ -56,11 +56,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..25, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..21, id: Name("range"), ctx: Load, @@ -68,11 +68,11 @@ Module( ), arguments: Arguments { range: 21..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..24, value: Int( 10, @@ -93,11 +93,11 @@ Module( ), Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..50, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("y"), ctx: Load, @@ -106,10 +106,10 @@ Module( generators: [ Comprehension { range: 31..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("y"), ctx: Store, @@ -117,11 +117,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..49, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..45, id: Name("range"), ctx: Load, @@ -129,11 +129,11 @@ Module( ), arguments: Arguments { range: 45..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..48, value: Int( 10, @@ -161,15 +161,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..77, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..77, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..55, id: Name("sum"), ctx: Load, @@ -177,15 +177,15 @@ Module( ), arguments: Arguments { range: 55..77, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..76, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("x"), ctx: Load, @@ -194,10 +194,10 @@ Module( generators: [ Comprehension { range: 58..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("x"), ctx: Store, @@ -205,11 +205,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..76, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..72, id: Name("range"), ctx: Load, @@ -217,11 +217,11 @@ Module( ), arguments: Arguments { range: 72..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..75, value: Int( 10, @@ -249,15 +249,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..106, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..106, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..81, id: Name("sum"), ctx: Load, @@ -265,15 +265,15 @@ Module( ), arguments: Arguments { range: 81..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..104, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, id: Name("x"), ctx: Load, @@ -282,10 +282,10 @@ Module( generators: [ Comprehension { range: 85..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, id: Name("x"), ctx: Store, @@ -293,11 +293,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..103, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..99, id: Name("range"), ctx: Load, @@ -305,11 +305,11 @@ Module( ), arguments: Arguments { range: 99..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..102, value: Int( 10, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap index a9a4f61078..1fe9bc4e9c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/assign_stmt_starred_ex ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..36, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("_"), ctx: Store, @@ -26,7 +26,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, value: Int( 4, @@ -37,12 +37,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("_"), ctx: Store, @@ -51,12 +51,12 @@ Module( ], value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..13, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, value: Int( 4, @@ -71,12 +71,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..25, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("_"), ctx: Store, @@ -85,21 +85,21 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..25, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..23, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, value: Int( 1, @@ -122,12 +122,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..35, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("_"), ctx: Store, @@ -136,21 +136,21 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..35, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..34, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap index 52e3ad2338..5d1a27f814 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/assign_targets_termina ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..39, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -25,7 +25,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("y"), ctx: Store, @@ -33,7 +33,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("z"), ctx: Store, @@ -42,7 +42,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..13, value: Int( 1, @@ -53,16 +53,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..19, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..19, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, id: Name("a"), ctx: Load, @@ -70,7 +70,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("b"), ctx: Load, @@ -85,12 +85,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..33, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, id: Name("x"), ctx: Store, @@ -98,7 +98,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("y"), ctx: Store, @@ -106,7 +106,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, id: Name("z"), ctx: Store, @@ -115,7 +115,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, value: Int( 1, @@ -126,16 +126,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..38, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..38, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("a"), ctx: Load, @@ -143,7 +143,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, id: Name("b"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap index f01730187c..5443d07ff3 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/async_for_statement.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..30, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..29, is_async: true, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..16, id: Name("target"), ctx: Store, @@ -25,7 +25,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..24, id: Name("iter"), ctx: Load, @@ -34,11 +34,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap index 52ec987c61..d3fe2817d2 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/async_function_definit ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..21, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, is_async: true, decorator_list: [], name: Identifier { id: Name("foo"), range: 10..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 13..15, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,11 +35,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap index be892875b2..d653933f32 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/async_with_statement.p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..21, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, is_async: true, items: [ WithItem { range: 11..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..15, id: Name("item"), ctx: Load, @@ -33,11 +33,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap index d1f1b93250..19bfd3e342 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap @@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/ok/class_def_arguments.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..32, body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..14, decorator_list: [], name: Identifier { id: Name("Foo"), range: 6..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..14, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..14, }, ), @@ -40,19 +40,19 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..31, decorator_list: [], name: Identifier { id: Name("Foo"), range: 21..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 24..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -60,11 +60,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..31, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..31, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap index ad057f45f6..12e1125f1a 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/class_keyword_in_case_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..34, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..33, subject: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, value: Int( 2, @@ -26,14 +26,14 @@ Module( cases: [ MatchCase { range: 13..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 18..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..23, id: Name("Class"), ctx: Load, @@ -41,27 +41,27 @@ Module( ), arguments: PatternArguments { range: 23..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 24..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchAs( PatternMatchAs { range: 26..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 26..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -75,11 +75,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..33, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..33, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap index e55236a706..d56ec292ba 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap @@ -7,42 +7,42 @@ input_file: crates/ruff_python_parser/resources/inline/ok/class_type_params_py31 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..96, body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..95, decorator_list: [], name: Identifier { id: Name("Foo"), range: 50..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 53..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 54..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("S"), range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..69, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, id: Name("str"), ctx: Load, @@ -50,7 +50,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..68, id: Name("bytes"), ctx: Load, @@ -68,16 +68,16 @@ Module( TypeVar( TypeParamTypeVar { range: 71..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 71..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..79, id: Name("float"), ctx: Load, @@ -90,11 +90,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 81..84, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 82..84, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -102,11 +102,11 @@ Module( ParamSpec( TypeParamParamSpec { range: 86..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 88..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -118,11 +118,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..95, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..95, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap index 9d9c72049a..c755a0542b 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/comma_separated_regula ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..181, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..144, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..144, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..143, value: Int( 0, @@ -36,16 +36,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..151, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..151, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, value: Int( 0, @@ -54,7 +54,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..150, value: Int( 1, @@ -69,16 +69,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..159, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..159, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..154, value: Int( 0, @@ -87,7 +87,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..157, value: Int( 1, @@ -102,16 +102,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..169, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..169, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 161..162, value: Int( 0, @@ -120,7 +120,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..165, value: Int( 1, @@ -129,7 +129,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..168, value: Int( 2, @@ -144,16 +144,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..180, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..180, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..172, value: Int( 0, @@ -162,7 +162,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..175, value: Int( 1, @@ -171,7 +171,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..178, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap index 3a7f83d488..f53b08abea 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap @@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/inline/ok/debug_rename_import.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..86, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..25, names: [ Alias { range: 7..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("__debug__"), range: 7..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("debug"), range: 20..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -36,23 +36,23 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..52, module: Some( Identifier { id: Name("__debug__"), range: 31..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 48..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Some"), range: 48..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -62,29 +62,29 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..85, module: Some( Identifier { id: Name("x"), range: 58..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 67..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("__debug__"), range: 67..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("debug"), range: 80..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap index 14d34fa18b..7d009ac3d4 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_async_functi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..32, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..31, is_async: true, decorator_list: [ Decorator { range: 0..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..10, id: Name("decorator"), ctx: Load, @@ -32,14 +32,12 @@ Module( name: Identifier { id: Name("foo"), range: 21..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 24..26, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -50,11 +48,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..31, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..31, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap index 4ad9fb1dc8..957a81dd4f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_await_expres ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..96, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..95, is_async: true, decorator_list: [], name: Identifier { id: Name("foo"), range: 55..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 58..60, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,20 +35,20 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..95, is_async: false, decorator_list: [ Decorator { range: 66..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..76, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..76, id: Name("bar"), ctx: Load, @@ -63,14 +61,12 @@ Module( name: Identifier { id: Name("baz"), range: 85..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 88..90, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -81,11 +77,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..95, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..95, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap index 25bdacc747..578a528c1d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap @@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_expression_d ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..86, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..85, is_async: false, decorator_list: [ Decorator { range: 45..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..69, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..61, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..53, id: Name("buttons"), ctx: Load, @@ -38,7 +38,7 @@ Module( attr: Identifier { id: Name("clicked"), range: 54..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -46,7 +46,7 @@ Module( attr: Identifier { id: Name("connect"), range: 62..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -56,14 +56,12 @@ Module( name: Identifier { id: Name("spam"), range: 74..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 78..80, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -74,11 +72,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..85, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..85, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap index d3208630da..d6d40d9536 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap @@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_expression_e ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..97, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..96, is_async: false, decorator_list: [ Decorator { range: 45..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..80, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..50, id: Name("eval"), ctx: Load, @@ -33,17 +33,17 @@ Module( ), arguments: Arguments { range: 50..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..79, value: StringLiteralValue { inner: Single( StringLiteral { range: 51..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "buttons[0].clicked.connect", flags: StringLiteralFlags { quote_style: Double, @@ -65,14 +65,12 @@ Module( name: Identifier { id: Name("spam"), range: 85..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 89..91, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -83,11 +81,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..96, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..96, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap index f83bba2ca6..3250a9ad0f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap @@ -7,38 +7,36 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_expression_i ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..111, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..63, is_async: false, decorator_list: [], name: Identifier { id: Name("_"), range: 49..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 50..53, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 51..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 51..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 51..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -53,12 +51,12 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..63, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("x"), ctx: Load, @@ -72,20 +70,20 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..110, is_async: false, decorator_list: [ Decorator { range: 64..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..94, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, id: Name("_"), ctx: Load, @@ -93,23 +91,23 @@ Module( ), arguments: Arguments { range: 66..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..93, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..85, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..77, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..74, id: Name("buttons"), ctx: Load, @@ -117,7 +115,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, value: Int( 0, @@ -130,7 +128,7 @@ Module( attr: Identifier { id: Name("clicked"), range: 78..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -138,7 +136,7 @@ Module( attr: Identifier { id: Name("connect"), range: 86..93, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -153,14 +151,12 @@ Module( name: Identifier { id: Name("spam"), range: 99..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 103..105, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -171,11 +167,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..110, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..110, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap index 500d2a4b23..dca975e0e9 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap @@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/ok/decorator_expression_p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..129, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..88, is_async: false, decorator_list: [ Decorator { range: 45..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..72, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..64, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..56, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..53, id: Name("buttons"), ctx: Load, @@ -41,7 +41,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 0, @@ -54,7 +54,7 @@ Module( attr: Identifier { id: Name("clicked"), range: 57..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -62,7 +62,7 @@ Module( attr: Identifier { id: Name("connect"), range: 65..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -72,14 +72,12 @@ Module( name: Identifier { id: Name("spam"), range: 77..81, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 81..83, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -90,11 +88,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, }, ), @@ -105,24 +103,24 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..128, is_async: false, decorator_list: [ Decorator { range: 89..113, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..113, func: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..107, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..92, id: Name("x"), ctx: Store, @@ -130,26 +128,24 @@ Module( ), value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..107, parameters: Some( Parameters { range: 103..104, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 103..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 103..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 103..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -163,7 +159,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..107, id: Name("x"), ctx: Load, @@ -175,11 +171,11 @@ Module( ), arguments: Arguments { range: 108..113, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, id: Name("foo"), ctx: Load, @@ -195,14 +191,12 @@ Module( name: Identifier { id: Name("bar"), range: 118..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 121..123, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -213,11 +207,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..128, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..128, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap index ebaae1fd52..e3595cb157 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/del_debug_py38.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..57, body: [ Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..56, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..56, id: Name("__debug__"), ctx: Del, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap index cd953e9041..2c6467849c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/del_targets_terminator ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..29, body: [ Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("a"), ctx: Del, @@ -25,7 +25,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("b"), ctx: Del, @@ -36,16 +36,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..14, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..14, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("c"), ctx: Load, @@ -53,7 +53,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("d"), ctx: Load, @@ -68,12 +68,12 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..23, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("a"), ctx: Del, @@ -81,7 +81,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("b"), ctx: Del, @@ -92,16 +92,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..28, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..28, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("c"), ctx: Load, @@ -109,7 +109,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("d"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap index 9c3c3f576f..68d5a3ac0e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/dotted_name_normalized ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..32, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, names: [ Alias { range: 7..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a.b.c"), range: 7..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -30,16 +30,16 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..31, names: [ Alias { range: 20..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a.b.c"), range: 20..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap index 277f35c150..bb0ad14135 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/duplicate_match_key_at ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..40, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..39, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -25,19 +25,19 @@ Module( cases: [ MatchCase { range: 13..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 18..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("x"), ctx: Load, @@ -46,18 +46,18 @@ Module( attr: Identifier { id: Name("a"), range: 21..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..30, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("x"), ctx: Load, @@ -66,7 +66,7 @@ Module( attr: Identifier { id: Name("a"), range: 29..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -76,10 +76,10 @@ Module( MatchValue( PatternMatchValue { range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, value: Int( 1, @@ -91,10 +91,10 @@ Module( MatchValue( PatternMatchValue { range: 32..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, value: Int( 2, @@ -111,11 +111,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..39, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..39, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap index c3efa0df92..f4f83b064f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/except_star_py311.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..77, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..76, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, }, ), @@ -32,11 +32,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 53..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..71, id: Name("ValueError"), ctx: Load, @@ -47,11 +47,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..76, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..76, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap index 07ef1ddbd3..d6f25ac1cc 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/except_stmt_as_name_so ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..100, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..99, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..8, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..8, }, ), @@ -32,11 +32,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 9..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..25, id: Name("Exception"), ctx: Load, @@ -47,17 +47,17 @@ Module( Identifier { id: Name("match"), range: 29..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..39, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..39, }, ), @@ -69,11 +69,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 40..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..56, id: Name("Exception"), ctx: Load, @@ -84,17 +84,17 @@ Module( Identifier { id: Name("case"), range: 60..64, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..69, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..69, }, ), @@ -106,11 +106,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 70..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..86, id: Name("Exception"), ctx: Load, @@ -121,17 +121,17 @@ Module( Identifier { id: Name("type"), range: 90..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap index bf94e92b01..2d4a97a396 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/except_stmt_unparenthe ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..117, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..79, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..57, }, ), @@ -26,16 +26,16 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 58..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..69, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, id: Name("x"), ctx: Load, @@ -43,7 +43,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("y"), ctx: Load, @@ -59,7 +59,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..79, }, ), @@ -74,12 +74,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..116, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..93, }, ), @@ -88,16 +88,16 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 94..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..106, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, id: Name("x"), ctx: Load, @@ -105,7 +105,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, id: Name("y"), ctx: Load, @@ -121,7 +121,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..116, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap index d5977dbfc4..05f893a42c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/arguments.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..805, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..108, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..108, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..106, id: Name("call"), ctx: Load, @@ -28,7 +28,7 @@ Module( ), arguments: Arguments { range: 106..108, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -38,15 +38,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..119, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..119, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..113, id: Name("call"), ctx: Load, @@ -54,11 +54,11 @@ Module( ), arguments: Arguments { range: 113..119, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..115, id: Name("x"), ctx: Load, @@ -66,7 +66,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..118, id: Name("y"), ctx: Load, @@ -81,15 +81,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..131, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..131, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..124, id: Name("call"), ctx: Load, @@ -97,11 +97,11 @@ Module( ), arguments: Arguments { range: 124..131, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..126, id: Name("x"), ctx: Load, @@ -109,7 +109,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, id: Name("y"), ctx: Load, @@ -124,15 +124,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..164, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..164, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..154, id: Name("call"), ctx: Load, @@ -140,22 +140,22 @@ Module( ), arguments: Arguments { range: 154..164, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 155..158, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 155..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..158, value: Int( 1, @@ -165,17 +165,17 @@ Module( }, Keyword { range: 160..163, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("y"), range: 160..161, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..163, value: Int( 2, @@ -191,15 +191,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..173, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..173, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..169, id: Name("call"), ctx: Load, @@ -207,15 +207,15 @@ Module( ), arguments: Arguments { range: 169..173, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..172, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..172, id: Name("x"), ctx: Load, @@ -233,15 +233,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..183, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..183, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..178, id: Name("call"), ctx: Load, @@ -249,16 +249,16 @@ Module( ), arguments: Arguments { range: 178..183, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 179..182, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..182, id: Name("x"), ctx: Load, @@ -273,15 +273,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..205, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..205, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..197, id: Name("call"), ctx: Load, @@ -289,11 +289,11 @@ Module( ), arguments: Arguments { range: 197..205, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 198..199, id: Name("x"), ctx: Load, @@ -303,17 +303,17 @@ Module( keywords: [ Keyword { range: 201..204, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("y"), range: 201..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 203..204, value: Int( 1, @@ -329,15 +329,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..217, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..217, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..210, id: Name("call"), ctx: Load, @@ -345,11 +345,11 @@ Module( ), arguments: Arguments { range: 210..217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..212, id: Name("x"), ctx: Load, @@ -357,11 +357,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..216, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..216, id: Name("y"), ctx: Load, @@ -379,15 +379,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 218..230, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 218..230, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 218..222, id: Name("call"), ctx: Load, @@ -395,11 +395,11 @@ Module( ), arguments: Arguments { range: 222..230, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..224, id: Name("x"), ctx: Load, @@ -409,11 +409,11 @@ Module( keywords: [ Keyword { range: 226..229, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..229, id: Name("y"), ctx: Load, @@ -428,15 +428,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..244, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..244, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..235, id: Name("call"), ctx: Load, @@ -444,15 +444,15 @@ Module( ), arguments: Arguments { range: 235..244, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..243, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..243, id: Name("y"), ctx: Load, @@ -465,17 +465,17 @@ Module( keywords: [ Keyword { range: 236..239, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 236..237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..239, value: Int( 1, @@ -491,15 +491,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..259, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..259, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..249, id: Name("call"), ctx: Load, @@ -507,22 +507,22 @@ Module( ), arguments: Arguments { range: 249..259, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 250..253, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 250..251, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 252..253, value: Int( 1, @@ -532,11 +532,11 @@ Module( }, Keyword { range: 255..258, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 257..258, id: Name("y"), ctx: Load, @@ -551,15 +551,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..273, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..273, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..264, id: Name("call"), ctx: Load, @@ -567,15 +567,15 @@ Module( ), arguments: Arguments { range: 264..273, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..267, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 266..267, id: Name("x"), ctx: Load, @@ -588,11 +588,11 @@ Module( keywords: [ Keyword { range: 269..272, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..272, id: Name("y"), ctx: Load, @@ -607,15 +607,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..288, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..288, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..278, id: Name("call"), ctx: Load, @@ -623,15 +623,15 @@ Module( ), arguments: Arguments { range: 278..288, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 279..281, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 280..281, id: Name("x"), ctx: Load, @@ -642,7 +642,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 283..284, id: Name("y"), ctx: Load, @@ -650,7 +650,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..287, id: Name("z"), ctx: Load, @@ -665,15 +665,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 289..308, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 289..308, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 289..293, id: Name("call"), ctx: Load, @@ -681,16 +681,16 @@ Module( ), arguments: Arguments { range: 293..308, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 294..297, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 296..297, id: Name("x"), ctx: Load, @@ -699,17 +699,17 @@ Module( }, Keyword { range: 299..302, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("y"), range: 299..300, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..302, value: Int( 1, @@ -719,17 +719,17 @@ Module( }, Keyword { range: 304..307, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("z"), range: 304..305, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..307, value: Int( 2, @@ -745,15 +745,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 309..335, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 309..335, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 309..313, id: Name("call"), ctx: Load, @@ -761,15 +761,15 @@ Module( ), arguments: Arguments { range: 313..335, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 314..317, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 315..317, id: Name("x1"), ctx: Load, @@ -780,11 +780,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..322, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 320..322, id: Name("x2"), ctx: Load, @@ -797,11 +797,11 @@ Module( keywords: [ Keyword { range: 324..328, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 326..328, id: Name("y1"), ctx: Load, @@ -810,11 +810,11 @@ Module( }, Keyword { range: 330..334, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 332..334, id: Name("y2"), ctx: Load, @@ -829,15 +829,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..355, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..355, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..340, id: Name("call"), ctx: Load, @@ -845,22 +845,22 @@ Module( ), arguments: Arguments { range: 340..355, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 341..344, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 341..342, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 343..344, value: Int( 1, @@ -870,11 +870,11 @@ Module( }, Keyword { range: 346..349, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..349, id: Name("y"), ctx: Load, @@ -883,17 +883,17 @@ Module( }, Keyword { range: 351..354, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("z"), range: 351..352, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 353..354, value: Int( 1, @@ -909,15 +909,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 378..402, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 378..402, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 378..382, id: Name("call"), ctx: Load, @@ -925,33 +925,33 @@ Module( ), arguments: Arguments { range: 382..402, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 383..401, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 383..384, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 385..401, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 390..394, value: true, }, ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 385..386, value: Int( 1, @@ -960,7 +960,7 @@ Module( ), orelse: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 400..401, value: Int( 2, @@ -978,15 +978,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..418, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..418, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 403..407, id: Name("call"), ctx: Load, @@ -994,26 +994,26 @@ Module( ), arguments: Arguments { range: 407..418, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 408..417, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 408..409, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 410..417, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 416..417, id: Name("y"), ctx: Load, @@ -1030,15 +1030,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 419..438, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 419..438, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 419..423, id: Name("call"), ctx: Load, @@ -1046,41 +1046,39 @@ Module( ), arguments: Arguments { range: 423..438, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 424..437, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 424..425, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 426..437, parameters: Some( Parameters { range: 433..434, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 433..434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 433..434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 433..434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1094,7 +1092,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 436..437, id: Name("y"), ctx: Load, @@ -1111,15 +1109,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 439..455, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 439..455, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 439..443, id: Name("call"), ctx: Load, @@ -1127,26 +1125,26 @@ Module( ), arguments: Arguments { range: 443..455, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 444..454, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("x"), range: 444..445, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 447..453, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 447..448, id: Name("y"), ctx: Store, @@ -1154,7 +1152,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 452..453, value: Int( 1, @@ -1172,15 +1170,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 476..491, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 476..491, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 476..480, id: Name("call"), ctx: Load, @@ -1188,16 +1186,16 @@ Module( ), arguments: Arguments { range: 480..491, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 482..489, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 488..489, id: Name("x"), ctx: Load, @@ -1215,15 +1213,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 492..512, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 492..512, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 492..496, id: Name("call"), ctx: Load, @@ -1231,15 +1229,15 @@ Module( ), arguments: Arguments { range: 496..512, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 498..510, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 509..510, id: Name("x"), ctx: Load, @@ -1256,15 +1254,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 533..545, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 533..545, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 533..537, id: Name("call"), ctx: Load, @@ -1272,15 +1270,15 @@ Module( ), arguments: Arguments { range: 537..545, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 538..544, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 538..539, id: Name("x"), ctx: Store, @@ -1288,7 +1286,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 543..544, value: Int( 1, @@ -1306,15 +1304,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 546..572, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 546..572, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 546..550, id: Name("call"), ctx: Load, @@ -1322,19 +1320,19 @@ Module( ), arguments: Arguments { range: 550..572, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 551..571, elt: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 551..557, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 551..552, id: Name("x"), ctx: Store, @@ -1342,7 +1340,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 556..557, value: Int( 1, @@ -1354,10 +1352,10 @@ Module( generators: [ Comprehension { range: 558..571, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 562..563, id: Name("i"), ctx: Store, @@ -1365,7 +1363,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 567..571, id: Name("iter"), ctx: Load, @@ -1387,15 +1385,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 596..610, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 596..610, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 596..600, id: Name("call"), ctx: Load, @@ -1403,21 +1401,21 @@ Module( ), arguments: Arguments { range: 600..610, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 601..609, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 602..609, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 602..603, id: Name("x"), ctx: Load, @@ -1425,7 +1423,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 608..609, id: Name("y"), ctx: Load, @@ -1446,15 +1444,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 611..623, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 611..623, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 611..615, id: Name("call"), ctx: Load, @@ -1462,19 +1460,19 @@ Module( ), arguments: Arguments { range: 615..623, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 616..622, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 617..622, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 617..618, id: Name("x"), ctx: Load, @@ -1483,7 +1481,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 621..622, id: Name("y"), ctx: Load, @@ -1503,15 +1501,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 624..638, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 624..638, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 624..628, id: Name("call"), ctx: Load, @@ -1519,19 +1517,19 @@ Module( ), arguments: Arguments { range: 628..638, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 629..637, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 630..637, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 636..637, id: Name("x"), ctx: Load, @@ -1551,15 +1549,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 639..657, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 639..657, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 639..643, id: Name("call"), ctx: Load, @@ -1567,34 +1565,32 @@ Module( ), arguments: Arguments { range: 643..657, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 644..656, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 645..656, parameters: Some( Parameters { range: 652..653, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 652..653, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 652..653, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 652..653, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1608,7 +1604,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 655..656, id: Name("x"), ctx: Load, @@ -1628,15 +1624,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 658..681, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 658..681, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 658..662, id: Name("call"), ctx: Load, @@ -1644,26 +1640,26 @@ Module( ), arguments: Arguments { range: 662..681, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 663..680, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 664..680, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 669..673, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 664..665, id: Name("x"), ctx: Load, @@ -1671,7 +1667,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 679..680, id: Name("y"), ctx: Load, @@ -1691,15 +1687,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 700..709, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 700..709, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 700..704, id: Name("call"), ctx: Load, @@ -1707,16 +1703,16 @@ Module( ), arguments: Arguments { range: 704..709, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 705..708, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 707..708, id: Name("x"), ctx: Load, @@ -1731,15 +1727,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 710..725, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 710..725, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 710..714, id: Name("call"), ctx: Load, @@ -1747,22 +1743,22 @@ Module( ), arguments: Arguments { range: 714..725, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 715..724, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 717..724, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 717..718, id: Name("x"), ctx: Load, @@ -1770,7 +1766,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 723..724, id: Name("y"), ctx: Load, @@ -1788,15 +1784,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 726..741, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 726..741, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 726..730, id: Name("call"), ctx: Load, @@ -1804,20 +1800,20 @@ Module( ), arguments: Arguments { range: 730..741, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 731..740, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 733..740, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 739..740, id: Name("x"), ctx: Load, @@ -1834,15 +1830,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 742..766, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 742..766, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 742..746, id: Name("call"), ctx: Load, @@ -1850,27 +1846,27 @@ Module( ), arguments: Arguments { range: 746..766, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 747..765, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 749..765, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 754..758, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 749..750, id: Name("x"), ctx: Load, @@ -1878,7 +1874,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 764..765, id: Name("y"), ctx: Load, @@ -1895,15 +1891,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 767..784, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 767..784, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 767..771, id: Name("call"), ctx: Load, @@ -1911,21 +1907,21 @@ Module( ), arguments: Arguments { range: 771..784, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 772..783, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 775..782, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 781..782, id: Name("x"), ctx: Load, @@ -1943,15 +1939,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 785..804, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 785..804, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 785..789, id: Name("call"), ctx: Load, @@ -1959,35 +1955,33 @@ Module( ), arguments: Arguments { range: 789..804, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 790..803, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 792..803, parameters: Some( Parameters { range: 799..800, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 799..800, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 799..800, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 799..800, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2001,7 +1995,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 802..803, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap index e6b46d32b7..baa336d282 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/attribute.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..90, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, id: Name("value"), ctx: Load, @@ -29,7 +29,7 @@ Module( attr: Identifier { id: Name("attr"), range: 6..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -38,19 +38,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..23, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..23, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..21, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..16, id: Name("value"), ctx: Load, @@ -59,14 +59,14 @@ Module( attr: Identifier { id: Name("attr"), range: 17..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 21..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -76,19 +76,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..36, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..36, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..31, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..29, id: Name("value"), ctx: Load, @@ -96,7 +96,7 @@ Module( ), arguments: Arguments { range: 29..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -105,7 +105,7 @@ Module( attr: Identifier { id: Name("attr"), range: 32..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -114,27 +114,27 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..55, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..55, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..51, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..49, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..44, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..42, id: Name("value"), ctx: Load, @@ -142,7 +142,7 @@ Module( ), arguments: Arguments { range: 42..44, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -151,14 +151,14 @@ Module( attr: Identifier { id: Name("attr"), range: 45..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 49..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -167,7 +167,7 @@ Module( attr: Identifier { id: Name("foo"), range: 52..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -176,19 +176,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..70, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..70, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..66, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..61, id: Name("value"), ctx: Load, @@ -197,7 +197,7 @@ Module( attr: Identifier { id: Name("attr"), range: 62..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -205,7 +205,7 @@ Module( attr: Identifier { id: Name("foo"), range: 67..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -214,23 +214,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..89, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..89, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..85, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..83, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..77, id: Name("value"), ctx: Load, @@ -239,14 +239,14 @@ Module( attr: Identifier { id: Name("attr"), range: 79..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 83..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -255,7 +255,7 @@ Module( attr: Identifier { id: Name("foo"), range: 86..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap index d2791d35df..4b39468468 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/await.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..211, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -32,19 +32,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..19, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..19, left: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..15, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("x"), ctx: Load, @@ -55,7 +55,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, value: Int( 1, @@ -68,21 +68,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..33, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..33, op: And, values: [ Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..27, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("a"), ctx: Load, @@ -92,7 +92,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, id: Name("b"), ctx: Load, @@ -105,19 +105,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..43, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..43, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..43, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("f"), ctx: Load, @@ -125,7 +125,7 @@ Module( ), arguments: Arguments { range: 41..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -137,20 +137,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..56, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..56, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..56, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 1, @@ -159,7 +159,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 2, @@ -176,20 +176,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..69, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..69, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..69, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..65, value: Int( 3, @@ -198,7 +198,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..68, value: Int( 4, @@ -214,22 +214,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..82, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..82, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..82, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("i"), ctx: Load, @@ -238,7 +238,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..81, value: Int( 5, @@ -255,20 +255,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..93, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..93, elts: [ Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..90, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, value: Int( 7, @@ -279,7 +279,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..93, value: Int( 8, @@ -295,20 +295,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..107, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..107, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..107, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..102, value: Int( 9, @@ -317,7 +317,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..106, value: Int( 10, @@ -335,19 +335,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..120, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..120, left: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..115, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..115, value: Int( 1, @@ -362,7 +362,7 @@ Module( comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, value: Int( 1, @@ -376,26 +376,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..146, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..146, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..136, value: true, }, ), body: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..128, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("x"), ctx: Load, @@ -405,7 +405,7 @@ Module( ), orelse: NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..146, }, ), @@ -415,24 +415,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..158, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..158, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..158, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..156, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..156, id: Name("x"), ctx: Load, @@ -452,34 +452,32 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..178, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..178, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..177, parameters: Some( Parameters { range: 173..174, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 173..174, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 173..174, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 173..174, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -493,7 +491,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..177, id: Name("x"), ctx: Load, @@ -507,19 +505,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..192, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..192, left: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..186, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..186, id: Name("x"), ctx: Load, @@ -530,12 +528,12 @@ Module( op: Pow, right: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..192, op: USub, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..192, id: Name("x"), ctx: Load, @@ -549,19 +547,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..211, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..211, left: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..200, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..200, id: Name("x"), ctx: Load, @@ -572,11 +570,11 @@ Module( op: Pow, right: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..211, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 210..211, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap index ac83b26a4d..3b4a7feb7b 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/bin_op.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..397, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..14, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..14, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 1, @@ -30,7 +30,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, value: Int( 2, @@ -43,15 +43,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..20, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..20, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, value: Int( 1, @@ -61,7 +61,7 @@ Module( op: Sub, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, value: Int( 2, @@ -74,15 +74,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..26, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..26, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, value: Int( 1, @@ -92,7 +92,7 @@ Module( op: Mult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, value: Int( 2, @@ -105,15 +105,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..32, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..32, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, value: Int( 1, @@ -123,7 +123,7 @@ Module( op: Div, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..32, value: Int( 2, @@ -136,15 +136,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..39, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..39, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..34, value: Int( 1, @@ -154,7 +154,7 @@ Module( op: FloorDiv, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, value: Int( 2, @@ -167,15 +167,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..45, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..45, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, value: Int( 1, @@ -185,7 +185,7 @@ Module( op: Mod, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, value: Int( 2, @@ -198,15 +198,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..52, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..52, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, value: Int( 1, @@ -216,7 +216,7 @@ Module( op: Pow, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 2, @@ -229,15 +229,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..58, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..58, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, value: Int( 1, @@ -247,7 +247,7 @@ Module( op: BitOr, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, value: Int( 2, @@ -260,15 +260,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..64, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..64, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, value: Int( 1, @@ -278,7 +278,7 @@ Module( op: BitXor, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, value: Int( 2, @@ -291,15 +291,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..70, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..70, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, value: Int( 1, @@ -309,7 +309,7 @@ Module( op: BitAnd, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..70, value: Int( 2, @@ -322,15 +322,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..77, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..77, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, value: Int( 1, @@ -340,7 +340,7 @@ Module( op: RShift, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..77, value: Int( 2, @@ -353,15 +353,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..84, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..84, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, value: Int( 1, @@ -371,7 +371,7 @@ Module( op: LShift, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, value: Int( 2, @@ -384,15 +384,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..90, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..90, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..86, value: Int( 1, @@ -402,7 +402,7 @@ Module( op: MatMult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, value: Int( 2, @@ -415,23 +415,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..123, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..123, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..119, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..115, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..111, value: Int( 1, @@ -441,7 +441,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..115, value: Int( 2, @@ -453,7 +453,7 @@ Module( op: Sub, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..119, value: Int( 3, @@ -465,7 +465,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, value: Int( 4, @@ -478,31 +478,31 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..146, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..146, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..142, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..138, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..133, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..129, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..125, value: Int( 1, @@ -512,7 +512,7 @@ Module( op: Mult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, value: Int( 2, @@ -524,7 +524,7 @@ Module( op: Div, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, value: Int( 3, @@ -536,7 +536,7 @@ Module( op: FloorDiv, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..138, value: Int( 4, @@ -548,7 +548,7 @@ Module( op: MatMult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..142, value: Int( 5, @@ -560,7 +560,7 @@ Module( op: Mod, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..146, value: Int( 6, @@ -573,27 +573,27 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..168, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..168, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..163, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..158, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..153, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..148, value: Int( 1, @@ -603,7 +603,7 @@ Module( op: LShift, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..153, value: Int( 2, @@ -615,7 +615,7 @@ Module( op: RShift, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..158, value: Int( 3, @@ -627,7 +627,7 @@ Module( op: RShift, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..163, value: Int( 4, @@ -639,7 +639,7 @@ Module( op: LShift, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..168, value: Int( 5, @@ -652,15 +652,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..202, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..202, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..194, value: Int( 1, @@ -670,11 +670,11 @@ Module( op: Add, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..202, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..198, value: Int( 2, @@ -684,7 +684,7 @@ Module( op: Mult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..202, value: Int( 3, @@ -699,19 +699,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 203..212, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 203..212, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 203..208, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 203..204, value: Int( 1, @@ -721,7 +721,7 @@ Module( op: Mult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..208, value: Int( 2, @@ -733,7 +733,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..212, value: Int( 3, @@ -746,31 +746,31 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..244, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..244, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..235, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..231, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..223, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..219, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..214, value: Int( 1, @@ -780,7 +780,7 @@ Module( op: Pow, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 218..219, value: Int( 2, @@ -792,7 +792,7 @@ Module( op: Mult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..223, value: Int( 3, @@ -804,11 +804,11 @@ Module( op: Sub, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..231, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..227, value: Int( 4, @@ -818,7 +818,7 @@ Module( op: MatMult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..231, value: Int( 5, @@ -832,7 +832,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..235, value: Int( 6, @@ -844,11 +844,11 @@ Module( op: Sub, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..244, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..239, value: Int( 7, @@ -858,7 +858,7 @@ Module( op: FloorDiv, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 243..244, value: Int( 8, @@ -873,15 +873,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 270..306, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 270..306, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 270..271, value: Int( 1, @@ -891,15 +891,15 @@ Module( op: BitOr, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..306, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..279, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..275, value: Int( 2, @@ -909,7 +909,7 @@ Module( op: BitAnd, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 278..279, value: Int( 3, @@ -921,19 +921,19 @@ Module( op: BitXor, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..306, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..301, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..291, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..283, value: Int( 4, @@ -943,11 +943,11 @@ Module( op: Add, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..291, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..287, value: Int( 5, @@ -957,7 +957,7 @@ Module( op: MatMult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..291, value: Int( 6, @@ -971,11 +971,11 @@ Module( op: LShift, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 295..301, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 295..296, value: Int( 7, @@ -985,7 +985,7 @@ Module( op: FloorDiv, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..301, value: Int( 8, @@ -999,7 +999,7 @@ Module( op: RShift, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 305..306, value: Int( 9, @@ -1016,19 +1016,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..339, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..339, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..335, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..325, value: Int( 1, @@ -1038,11 +1038,11 @@ Module( op: Add, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 329..334, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 329..330, value: Int( 2, @@ -1052,7 +1052,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 333..334, value: Int( 3, @@ -1066,7 +1066,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 338..339, value: Int( 4, @@ -1079,19 +1079,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..359, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..359, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..345, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..341, value: Int( 1, @@ -1101,7 +1101,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..345, value: Int( 2, @@ -1113,15 +1113,15 @@ Module( op: Add, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 349..358, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 349..354, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 349..350, value: Int( 3, @@ -1131,7 +1131,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 353..354, value: Int( 4, @@ -1143,7 +1143,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 357..358, value: Int( 5, @@ -1158,15 +1158,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 390..396, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 390..396, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 390..391, id: Name("x"), ctx: Load, @@ -1175,12 +1175,12 @@ Module( op: Add, right: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 393..396, op: UAdd, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 395..396, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap index 7805f521fb..90362fa9dd 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/bool_op.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..142, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("a"), ctx: Load, @@ -30,7 +30,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("b"), ctx: Load, @@ -43,17 +43,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..21, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..21, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("a"), ctx: Load, @@ -61,7 +61,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("b"), ctx: Load, @@ -69,7 +69,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, id: Name("c"), ctx: Load, @@ -82,17 +82,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..28, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..28, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("a"), ctx: Load, @@ -100,7 +100,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, id: Name("b"), ctx: Load, @@ -113,17 +113,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..40, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..40, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("a"), ctx: Load, @@ -131,7 +131,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("b"), ctx: Load, @@ -139,7 +139,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("c"), ctx: Load, @@ -152,23 +152,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..53, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..53, op: Or, values: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..48, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("a"), ctx: Load, @@ -176,7 +176,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("b"), ctx: Load, @@ -187,7 +187,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, id: Name("c"), ctx: Load, @@ -200,23 +200,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..88, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..88, op: Or, values: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..67, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, id: Name("a"), ctx: Load, @@ -224,7 +224,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("b"), ctx: Load, @@ -232,7 +232,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, id: Name("c"), ctx: Load, @@ -243,7 +243,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, id: Name("d"), ctx: Load, @@ -251,13 +251,13 @@ Module( ), BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..83, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..77, id: Name("e"), ctx: Load, @@ -265,7 +265,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, id: Name("f"), ctx: Load, @@ -276,7 +276,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..88, id: Name("g"), ctx: Load, @@ -289,23 +289,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..105, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..105, op: Or, values: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..100, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, id: Name("a"), ctx: Load, @@ -313,12 +313,12 @@ Module( ), UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..100, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, id: Name("b"), ctx: Load, @@ -331,7 +331,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, id: Name("c"), ctx: Load, @@ -344,28 +344,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..124, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..124, value: Some( BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..124, op: Or, values: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..119, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..113, id: Name("a"), ctx: Load, @@ -373,7 +373,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..119, id: Name("b"), ctx: Load, @@ -384,7 +384,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..124, id: Name("c"), ctx: Load, @@ -400,28 +400,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..141, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..141, op: Or, values: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..136, op: And, values: [ UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..130, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, id: Name("a"), ctx: Load, @@ -431,7 +431,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, id: Name("b"), ctx: Load, @@ -442,7 +442,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..141, id: Name("c"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap index 7a33b5db76..452c617b2e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/call.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..349, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..120, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..120, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..118, id: Name("call"), ctx: Load, @@ -28,7 +28,7 @@ Module( ), arguments: Arguments { range: 118..120, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -38,19 +38,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..132, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..132, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..130, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..125, id: Name("attr"), ctx: Load, @@ -59,14 +59,14 @@ Module( attr: Identifier { id: Name("expr"), range: 126..130, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 130..132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -76,19 +76,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..150, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..150, func: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..148, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..142, id: Name("subscript"), ctx: Load, @@ -96,12 +96,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..147, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..144, value: Int( 1, @@ -110,7 +110,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, value: Int( 2, @@ -127,7 +127,7 @@ Module( ), arguments: Arguments { range: 148..150, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -137,19 +137,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..162, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..162, func: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..160, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..156, id: Name("slice"), ctx: Load, @@ -157,13 +157,13 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..159, lower: None, upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..159, value: Int( 1, @@ -179,7 +179,7 @@ Module( ), arguments: Arguments { range: 160..162, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -189,20 +189,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..174, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..174, func: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..172, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..165, value: Int( 1, @@ -211,7 +211,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..168, value: Int( 2, @@ -220,7 +220,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..171, value: Int( 3, @@ -233,7 +233,7 @@ Module( ), arguments: Arguments { range: 172..174, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -243,20 +243,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..186, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..186, func: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..184, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..177, value: Int( 1, @@ -265,7 +265,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..180, value: Int( 2, @@ -274,7 +274,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..183, value: Int( 3, @@ -288,7 +288,7 @@ Module( ), arguments: Arguments { range: 184..186, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -298,19 +298,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..206, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..206, func: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..204, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..189, id: Name("x"), ctx: Load, @@ -319,10 +319,10 @@ Module( generators: [ Comprehension { range: 190..203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..195, id: Name("x"), ctx: Store, @@ -330,7 +330,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..203, id: Name("iter"), ctx: Load, @@ -345,7 +345,7 @@ Module( ), arguments: Arguments { range: 204..206, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -355,20 +355,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..218, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..218, func: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..216, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..209, value: Int( 1, @@ -377,7 +377,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..212, value: Int( 2, @@ -386,7 +386,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..215, value: Int( 3, @@ -398,7 +398,7 @@ Module( ), arguments: Arguments { range: 216..218, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -408,22 +408,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..233, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..233, func: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..231, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..221, value: Int( 1, @@ -433,7 +433,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..224, value: Int( 2, @@ -445,7 +445,7 @@ Module( key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..227, value: Int( 3, @@ -455,7 +455,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 229..230, value: Int( 4, @@ -468,7 +468,7 @@ Module( ), arguments: Arguments { range: 231..233, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -478,20 +478,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..245, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..245, func: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..242, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..242, id: Name("x"), ctx: Load, @@ -502,7 +502,7 @@ Module( ), arguments: Arguments { range: 243..245, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -512,22 +512,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..312, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..312, func: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..310, value: true, }, ), arguments: Arguments { range: 310..312, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -537,22 +537,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..320, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..320, func: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..318, value: false, }, ), arguments: Arguments { range: 318..320, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -562,21 +562,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..327, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..327, func: NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..325, }, ), arguments: Arguments { range: 325..327, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -586,21 +586,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 328..338, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 328..338, func: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 328..336, value: StringLiteralValue { inner: Single( StringLiteral { range: 328..336, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "string", flags: StringLiteralFlags { quote_style: Double, @@ -614,7 +614,7 @@ Module( ), arguments: Arguments { range: 336..338, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -624,15 +624,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 339..342, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 339..342, func: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 339..340, value: Int( 1, @@ -641,7 +641,7 @@ Module( ), arguments: Arguments { range: 340..342, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -651,15 +651,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 343..348, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 343..348, func: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 343..346, value: Float( 1.0, @@ -668,7 +668,7 @@ Module( ), arguments: Arguments { range: 346..348, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap index e2bd2b568c..ef4b3720a0 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/compare.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..542, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..15, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..15, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, id: Name("a"), ctx: Load, @@ -32,7 +32,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("b"), ctx: Load, @@ -45,15 +45,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..21, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..21, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("b"), ctx: Load, @@ -65,7 +65,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, id: Name("a"), ctx: Load, @@ -78,15 +78,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..27, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..27, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("b"), ctx: Load, @@ -98,7 +98,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("a"), ctx: Load, @@ -111,15 +111,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..34, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..34, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, id: Name("a"), ctx: Load, @@ -131,7 +131,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..34, id: Name("b"), ctx: Load, @@ -144,15 +144,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..41, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..41, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("a"), ctx: Load, @@ -164,7 +164,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("b"), ctx: Load, @@ -177,15 +177,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..48, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..48, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, id: Name("a"), ctx: Load, @@ -197,7 +197,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("b"), ctx: Load, @@ -210,15 +210,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..55, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..55, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, id: Name("a"), ctx: Load, @@ -230,7 +230,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, id: Name("c"), ctx: Load, @@ -243,15 +243,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..62, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..62, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("a"), ctx: Load, @@ -263,7 +263,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..62, id: Name("b"), ctx: Load, @@ -276,15 +276,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..73, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..73, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, id: Name("a"), ctx: Load, @@ -296,7 +296,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("c"), ctx: Load, @@ -309,15 +309,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..84, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..84, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, id: Name("a"), ctx: Load, @@ -329,7 +329,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, id: Name("b"), ctx: Load, @@ -342,15 +342,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..156, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..156, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..111, id: Name("a"), ctx: Load, @@ -366,7 +366,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, id: Name("b"), ctx: Load, @@ -374,7 +374,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, id: Name("c"), ctx: Load, @@ -382,7 +382,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..138, id: Name("d"), ctx: Load, @@ -390,7 +390,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, id: Name("e"), ctx: Load, @@ -398,7 +398,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..156, id: Name("f"), ctx: Load, @@ -411,19 +411,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..203, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..203, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..182, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..178, id: Name("a"), ctx: Load, @@ -432,7 +432,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..182, id: Name("b"), ctx: Load, @@ -447,11 +447,11 @@ Module( comparators: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..190, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..186, id: Name("c"), ctx: Load, @@ -460,7 +460,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, id: Name("d"), ctx: Load, @@ -470,11 +470,11 @@ Module( ), BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 198..203, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 198..199, id: Name("e"), ctx: Load, @@ -483,7 +483,7 @@ Module( op: BitAnd, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..203, id: Name("f"), ctx: Load, @@ -498,20 +498,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 379..393, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 379..393, op: Not, operand: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..393, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..384, id: Name("x"), ctx: Load, @@ -523,7 +523,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 392..393, id: Name("y"), ctx: Load, @@ -538,17 +538,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 395..416, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 395..416, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 395..396, id: Name("x"), ctx: Load, @@ -556,17 +556,17 @@ Module( ), BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 400..416, op: And, values: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 400..410, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 400..401, id: Name("y"), ctx: Load, @@ -578,7 +578,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 409..410, id: Name("z"), ctx: Load, @@ -589,7 +589,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 415..416, id: Name("a"), ctx: Load, @@ -605,15 +605,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 417..429, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 417..429, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 417..418, id: Name("x"), ctx: Load, @@ -625,11 +625,11 @@ Module( comparators: [ Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 422..429, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 428..429, id: Name("y"), ctx: Load, @@ -644,15 +644,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 430..446, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 430..446, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 430..431, id: Name("x"), ctx: Load, @@ -664,11 +664,11 @@ Module( comparators: [ Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 439..446, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 445..446, id: Name("y"), ctx: Load, @@ -683,15 +683,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 489..541, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 489..541, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 489..490, id: Name("a"), ctx: Load, @@ -711,7 +711,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 493..494, id: Name("b"), ctx: Load, @@ -719,7 +719,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 498..499, id: Name("c"), ctx: Load, @@ -727,7 +727,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 502..503, id: Name("d"), ctx: Load, @@ -735,7 +735,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 507..508, id: Name("e"), ctx: Load, @@ -743,7 +743,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 516..517, id: Name("f"), ctx: Load, @@ -751,7 +751,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 525..526, id: Name("g"), ctx: Load, @@ -759,7 +759,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 530..531, id: Name("h"), ctx: Load, @@ -767,7 +767,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 535..536, id: Name("i"), ctx: Load, @@ -775,7 +775,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 540..541, id: Name("j"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap index d368b8654b..8ff7bb7782 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/dictionary.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..622, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..11, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..11, items: [], }, @@ -25,18 +25,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..18, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..18, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, value: Int( 1, @@ -46,7 +46,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, value: Int( 2, @@ -61,18 +61,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..43, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..43, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, value: Int( 1, @@ -82,7 +82,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, value: Int( 2, @@ -94,7 +94,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("a"), ctx: Load, @@ -103,7 +103,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, value: Int( 1, @@ -115,7 +115,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, id: Name("b"), ctx: Load, @@ -124,13 +124,13 @@ Module( ), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..42, value: StringLiteralValue { inner: Single( StringLiteral { range: 35..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello", flags: StringLiteralFlags { quote_style: Single, @@ -150,11 +150,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..69, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..69, items: [], }, @@ -163,18 +163,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..100, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..100, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..77, value: Int( 1, @@ -184,7 +184,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, value: Int( 2, @@ -196,7 +196,7 @@ Module( key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, value: Int( 3, @@ -206,7 +206,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, value: Int( 4, @@ -221,25 +221,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..132, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..132, items: [ DictItem { key: Some( Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..118, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..114, value: Int( 1, @@ -249,7 +249,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..117, value: Int( 2, @@ -263,14 +263,14 @@ Module( ), value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..131, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..122, value: Int( 3, @@ -280,14 +280,14 @@ Module( ), value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..130, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..126, value: Int( 4, @@ -297,7 +297,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, value: Int( 5, @@ -320,37 +320,35 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..171, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..171, items: [ DictItem { key: Some( Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..167, parameters: Some( Parameters { range: 163..164, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 163..164, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 163..164, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 163..164, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -364,7 +362,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..167, id: Name("x"), ctx: Load, @@ -375,7 +373,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..170, value: Int( 1, @@ -390,24 +388,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..202, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..202, items: [ DictItem { key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 173..176, value: StringLiteralValue { inner: Single( StringLiteral { range: 173..176, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "A", flags: StringLiteralFlags { quote_style: Single, @@ -422,26 +420,24 @@ Module( ), value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..192, parameters: Some( Parameters { range: 185..186, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 185..186, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 185..186, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("p"), range: 185..186, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -455,7 +451,7 @@ Module( ), body: NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..192, }, ), @@ -466,13 +462,13 @@ Module( key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..197, value: StringLiteralValue { inner: Single( StringLiteral { range: 194..197, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "B", flags: StringLiteralFlags { quote_style: Single, @@ -487,7 +483,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..200, id: Name("C"), ctx: Load, @@ -501,22 +497,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..237, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..237, items: [ DictItem { key: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..232, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..227, id: Name("x"), ctx: Store, @@ -524,7 +520,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..232, value: Int( 1, @@ -536,7 +532,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..236, id: Name("y"), ctx: Load, @@ -550,22 +546,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..258, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..258, items: [ DictItem { key: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..246, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..241, id: Name("x"), ctx: Store, @@ -573,7 +569,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..246, value: Int( 1, @@ -585,11 +581,11 @@ Module( ), value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..256, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..251, id: Name("y"), ctx: Store, @@ -597,7 +593,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..256, value: Int( 2, @@ -614,18 +610,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 284..289, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 284..289, items: [ DictItem { key: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 287..288, id: Name("d"), ctx: Load, @@ -639,18 +635,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..301, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..301, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 291..292, id: Name("a"), ctx: Load, @@ -659,7 +655,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 294..295, id: Name("b"), ctx: Load, @@ -670,7 +666,7 @@ Module( key: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 299..300, id: Name("d"), ctx: Load, @@ -684,18 +680,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 302..312, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 302..312, items: [ DictItem { key: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 305..306, id: Name("a"), ctx: Load, @@ -706,7 +702,7 @@ Module( key: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..311, id: Name("b"), ctx: Load, @@ -720,24 +716,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..338, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..338, items: [ DictItem { key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 314..317, value: StringLiteralValue { inner: Single( StringLiteral { range: 314..317, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", flags: StringLiteralFlags { quote_style: Double, @@ -752,13 +748,13 @@ Module( ), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..322, value: StringLiteralValue { inner: Single( StringLiteral { range: 319..322, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "b", flags: StringLiteralFlags { quote_style: Double, @@ -775,7 +771,7 @@ Module( key: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 326..327, id: Name("c"), ctx: Load, @@ -786,13 +782,13 @@ Module( key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 329..332, value: StringLiteralValue { inner: Single( StringLiteral { range: 329..332, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "d", flags: StringLiteralFlags { quote_style: Double, @@ -807,13 +803,13 @@ Module( ), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 334..337, value: StringLiteralValue { inner: Single( StringLiteral { range: 334..337, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "e", flags: StringLiteralFlags { quote_style: Double, @@ -833,18 +829,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 339..367, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 339..367, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..341, value: Int( 1, @@ -854,7 +850,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 343..344, value: Int( 2, @@ -866,20 +862,20 @@ Module( key: None, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..366, items: [ DictItem { key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 349..357, value: StringLiteralValue { inner: Single( StringLiteral { range: 349..357, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "nested", flags: StringLiteralFlags { quote_style: Single, @@ -894,13 +890,13 @@ Module( ), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 359..365, value: StringLiteralValue { inner: Single( StringLiteral { range: 359..365, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "dict", flags: StringLiteralFlags { quote_style: Single, @@ -924,22 +920,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 368..393, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 368..393, items: [ DictItem { key: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 369..374, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 369..370, id: Name("x"), ctx: Load, @@ -948,7 +944,7 @@ Module( op: Mult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 373..374, value: Int( 1, @@ -960,11 +956,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 376..382, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 376..377, id: Name("y"), ctx: Load, @@ -973,7 +969,7 @@ Module( op: Pow, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 381..382, value: Int( 2, @@ -987,11 +983,11 @@ Module( key: None, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 386..392, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 386..390, id: Name("call"), ctx: Load, @@ -999,7 +995,7 @@ Module( ), arguments: Arguments { range: 390..392, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1013,23 +1009,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 460..471, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 460..471, items: [ DictItem { key: None, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 464..469, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 468..469, id: Name("x"), ctx: Load, @@ -1045,18 +1041,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 494..515, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 494..515, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 495..496, value: Int( 1, @@ -1066,18 +1062,18 @@ Module( ), value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 498..514, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 503..507, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 498..499, id: Name("x"), ctx: Load, @@ -1085,7 +1081,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 513..514, id: Name("y"), ctx: Load, @@ -1101,26 +1097,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 516..575, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 516..575, key: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 517..533, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 522..526, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 517..518, id: Name("x"), ctx: Load, @@ -1128,7 +1124,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 532..533, id: Name("y"), ctx: Load, @@ -1138,7 +1134,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 535..536, id: Name("y"), ctx: Load, @@ -1147,10 +1143,10 @@ Module( generators: [ Comprehension { range: 537..555, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 541..542, id: Name("x"), ctx: Store, @@ -1158,11 +1154,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 546..555, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 546..551, id: Name("range"), ctx: Load, @@ -1170,11 +1166,11 @@ Module( ), arguments: Arguments { range: 551..555, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 552..554, value: Int( 10, @@ -1191,10 +1187,10 @@ Module( }, Comprehension { range: 556..574, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 560..561, id: Name("y"), ctx: Store, @@ -1202,11 +1198,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 565..574, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 565..570, id: Name("range"), ctx: Load, @@ -1214,11 +1210,11 @@ Module( ), arguments: Arguments { range: 570..574, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 571..573, value: Int( 10, @@ -1240,23 +1236,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 576..600, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 576..600, items: [ DictItem { key: Some( Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 577..583, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 578..579, value: Int( 1, @@ -1265,7 +1261,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 581..582, value: Int( 2, @@ -1278,7 +1274,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 585..586, value: Int( 3, @@ -1290,7 +1286,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 588..589, id: Name("x"), ctx: Load, @@ -1299,14 +1295,14 @@ Module( ), value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 591..598, items: [ DictItem { key: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 592..593, value: Int( 1, @@ -1316,7 +1312,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 595..596, value: Int( 2, @@ -1335,18 +1331,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 601..621, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 601..621, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 603..604, id: Name("x"), ctx: Load, @@ -1355,7 +1351,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 608..609, id: Name("y"), ctx: Load, @@ -1366,7 +1362,7 @@ Module( key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 613..614, id: Name("z"), ctx: Load, @@ -1375,7 +1371,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 618..619, id: Name("a"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap index d54aceae23..cf7709bd98 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/dictionary_com ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..589, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, id: Name("y"), ctx: Load, @@ -29,10 +29,10 @@ Module( generators: [ Comprehension { range: 3..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("y"), ctx: Store, @@ -40,12 +40,12 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..21, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, value: Int( 1, @@ -54,7 +54,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, value: Int( 2, @@ -63,7 +63,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, value: Int( 3, @@ -85,15 +85,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..42, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..42, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..26, id: Name("x1"), ctx: Load, @@ -101,7 +101,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..30, id: Name("x2"), ctx: Load, @@ -110,10 +110,10 @@ Module( generators: [ Comprehension { range: 31..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("y"), ctx: Store, @@ -121,7 +121,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("z"), ctx: Load, @@ -137,19 +137,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..73, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..73, key: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..49, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, id: Name("x"), ctx: Load, @@ -158,7 +158,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..49, value: Int( 1, @@ -169,13 +169,13 @@ Module( ), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..54, value: StringLiteralValue { inner: Single( StringLiteral { range: 51..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x", flags: StringLiteralFlags { quote_style: Single, @@ -190,10 +190,10 @@ Module( generators: [ Comprehension { range: 55..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, id: Name("i"), ctx: Store, @@ -201,11 +201,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..72, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..69, id: Name("range"), ctx: Load, @@ -213,11 +213,11 @@ Module( ), arguments: Arguments { range: 69..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, value: Int( 5, @@ -239,15 +239,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..122, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..122, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, id: Name("b"), ctx: Load, @@ -255,11 +255,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..83, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, id: Name("c"), ctx: Load, @@ -268,7 +268,7 @@ Module( op: Mult, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, value: Int( 2, @@ -280,10 +280,10 @@ Module( generators: [ Comprehension { range: 84..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, id: Name("c"), ctx: Store, @@ -291,7 +291,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, id: Name("d"), ctx: Load, @@ -300,11 +300,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..104, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, id: Name("x"), ctx: Load, @@ -316,7 +316,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..104, id: Name("w"), ctx: Load, @@ -327,13 +327,13 @@ Module( ), BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..116, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, id: Name("y"), ctx: Load, @@ -341,7 +341,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..116, id: Name("yy"), ctx: Load, @@ -352,7 +352,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..121, id: Name("z"), ctx: Load, @@ -368,15 +368,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..176, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..176, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..125, id: Name("a"), ctx: Load, @@ -384,11 +384,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..133, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("a"), ctx: Load, @@ -397,7 +397,7 @@ Module( op: Pow, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, value: Int( 2, @@ -409,10 +409,10 @@ Module( generators: [ Comprehension { range: 134..155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 138..139, id: Name("b"), ctx: Store, @@ -420,7 +420,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..144, id: Name("c"), ctx: Load, @@ -429,13 +429,13 @@ Module( ifs: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..155, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..149, id: Name("d"), ctx: Load, @@ -443,7 +443,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..155, id: Name("e"), ctx: Load, @@ -457,10 +457,10 @@ Module( }, Comprehension { range: 156..175, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..161, id: Name("f"), ctx: Store, @@ -468,7 +468,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..166, id: Name("j"), ctx: Load, @@ -477,11 +477,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..175, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..171, id: Name("k"), ctx: Load, @@ -493,7 +493,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..175, id: Name("h"), ctx: Load, @@ -512,15 +512,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..231, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..231, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..179, id: Name("a"), ctx: Load, @@ -528,7 +528,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..182, id: Name("b"), ctx: Load, @@ -537,10 +537,10 @@ Module( generators: [ Comprehension { range: 183..204, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..188, id: Name("b"), ctx: Store, @@ -548,7 +548,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..193, id: Name("c"), ctx: Load, @@ -557,13 +557,13 @@ Module( ifs: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..204, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..198, id: Name("d"), ctx: Load, @@ -571,7 +571,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 203..204, id: Name("e"), ctx: Load, @@ -585,10 +585,10 @@ Module( }, Comprehension { range: 205..230, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..216, id: Name("f"), ctx: Store, @@ -596,7 +596,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..221, id: Name("j"), ctx: Load, @@ -605,11 +605,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..230, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..226, id: Name("k"), ctx: Load, @@ -621,7 +621,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 229..230, id: Name("h"), ctx: Load, @@ -640,15 +640,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..252, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..252, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..234, id: Name("a"), ctx: Load, @@ -656,7 +656,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..237, id: Name("a"), ctx: Load, @@ -665,15 +665,15 @@ Module( generators: [ Comprehension { range: 238..251, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..246, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..243, id: Name("b"), ctx: Store, @@ -681,7 +681,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..246, id: Name("c"), ctx: Store, @@ -694,7 +694,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..251, id: Name("d"), ctx: Load, @@ -710,15 +710,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 391..416, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 391..416, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 392..393, id: Name("x"), ctx: Load, @@ -726,7 +726,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 395..396, id: Name("y"), ctx: Load, @@ -735,10 +735,10 @@ Module( generators: [ Comprehension { range: 397..415, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 401..402, id: Name("x"), ctx: Store, @@ -746,12 +746,12 @@ Module( ), iter: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 407..414, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 413..414, id: Name("y"), ctx: Load, @@ -770,15 +770,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 417..447, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 417..447, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 418..419, id: Name("x"), ctx: Load, @@ -786,7 +786,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..422, id: Name("y"), ctx: Load, @@ -795,10 +795,10 @@ Module( generators: [ Comprehension { range: 423..446, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 427..428, id: Name("x"), ctx: Store, @@ -806,11 +806,11 @@ Module( ), iter: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 433..445, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 444..445, id: Name("y"), ctx: Load, @@ -828,15 +828,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 448..477, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 448..477, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 449..450, id: Name("x"), ctx: Load, @@ -844,7 +844,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 452..453, id: Name("y"), ctx: Load, @@ -853,10 +853,10 @@ Module( generators: [ Comprehension { range: 454..476, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 458..459, id: Name("x"), ctx: Store, @@ -864,26 +864,24 @@ Module( ), iter: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 464..475, parameters: Some( Parameters { range: 471..472, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 471..472, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 471..472, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 471..472, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -897,7 +895,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 474..475, id: Name("y"), ctx: Load, @@ -915,15 +913,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 478..511, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 478..511, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 479..480, id: Name("x"), ctx: Load, @@ -931,7 +929,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 482..483, id: Name("y"), ctx: Load, @@ -940,10 +938,10 @@ Module( generators: [ Comprehension { range: 484..510, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 488..489, id: Name("x"), ctx: Store, @@ -951,7 +949,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 493..497, id: Name("data"), ctx: Load, @@ -960,12 +958,12 @@ Module( ifs: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 502..509, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 508..509, id: Name("y"), ctx: Load, @@ -984,15 +982,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 512..550, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 512..550, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 513..514, id: Name("x"), ctx: Load, @@ -1000,7 +998,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 516..517, id: Name("y"), ctx: Load, @@ -1009,10 +1007,10 @@ Module( generators: [ Comprehension { range: 518..549, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 522..523, id: Name("x"), ctx: Store, @@ -1020,7 +1018,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 527..531, id: Name("data"), ctx: Load, @@ -1029,11 +1027,11 @@ Module( ifs: [ YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 536..548, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 547..548, id: Name("y"), ctx: Load, @@ -1051,15 +1049,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 551..588, value: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 551..588, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 552..553, id: Name("x"), ctx: Load, @@ -1067,7 +1065,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 555..556, id: Name("y"), ctx: Load, @@ -1076,10 +1074,10 @@ Module( generators: [ Comprehension { range: 557..587, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 561..562, id: Name("x"), ctx: Store, @@ -1087,7 +1085,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 566..570, id: Name("data"), ctx: Load, @@ -1096,26 +1094,24 @@ Module( ifs: [ Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 575..586, parameters: Some( Parameters { range: 582..583, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 582..583, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 582..583, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 582..583, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1129,7 +1125,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 585..586, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap index 1fe9ef6fa7..adc0020609 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap @@ -7,23 +7,23 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/f_string.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..979, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..21, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..21, value: FStringValue { inner: Single( FString( FString { range: 18..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: FStringFlags { quote_style: Double, @@ -40,18 +40,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, value: FStringValue { inner: Single( FString( FString { range: 22..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: FStringFlags { quote_style: Double, @@ -68,18 +68,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, value: FStringValue { inner: Single( FString( FString { range: 26..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: FStringFlags { quote_style: Single, @@ -96,18 +96,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..37, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..37, value: FStringValue { inner: Single( FString( FString { range: 30..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: FStringFlags { quote_style: Double, @@ -124,18 +124,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..45, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..45, value: FStringValue { inner: Single( FString( FString { range: 38..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: FStringFlags { quote_style: Single, @@ -152,32 +152,32 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..56, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..56, value: FStringValue { inner: Single( FString( FString { range: 47..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 49..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..54, value: StringLiteralValue { inner: Single( StringLiteral { range: 50..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " f", flags: StringLiteralFlags { quote_style: Double, @@ -210,26 +210,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..67, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..67, value: FStringValue { inner: Single( FString( FString { range: 57..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 59..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, id: Name("foo"), ctx: Load, @@ -256,31 +256,31 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..75, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..75, value: FStringValue { inner: Single( FString( FString { range: 68..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 70..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..73, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, value: Int( 3, @@ -313,30 +313,30 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..86, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..86, value: FStringValue { inner: Single( FString( FString { range: 76..86, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 78..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..83, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, value: Int( 3, @@ -349,7 +349,7 @@ Module( comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, value: Int( 4, @@ -364,7 +364,7 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 84..84, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], }, ), @@ -386,26 +386,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..102, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..102, value: FStringValue { inner: Single( FString( FString { range: 87..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 89..101, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, value: Int( 3, @@ -417,21 +417,21 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 92..100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 92..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..96, value: StringLiteralValue { inner: Single( StringLiteral { range: 93..96, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "}", flags: StringLiteralFlags { quote_style: Double, @@ -451,7 +451,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 97..100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ">10", }, ), @@ -476,26 +476,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..118, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..118, value: FStringValue { inner: Single( FString( FString { range: 103..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 105..117, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..107, value: Int( 3, @@ -507,21 +507,21 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 108..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 108..113, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, value: StringLiteralValue { inner: Single( StringLiteral { range: 109..112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "{", flags: StringLiteralFlags { quote_style: Double, @@ -541,7 +541,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 113..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ">10", }, ), @@ -566,26 +566,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..133, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..133, value: FStringValue { inner: Single( FString( FString { range: 119..133, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 121..132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..127, id: Name("foo"), ctx: Load, @@ -617,26 +617,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..154, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..154, value: FStringValue { inner: Single( FString( FString { range: 134..154, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 136..153, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..142, id: Name("foo"), ctx: Load, @@ -652,12 +652,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 147..152, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 147..152, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f ", }, ), @@ -682,26 +682,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..173, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..173, value: FStringValue { inner: Single( FString( FString { range: 155..173, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 157..172, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..163, id: Name("foo"), ctx: Load, @@ -733,31 +733,31 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..190, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..190, value: FStringValue { inner: Single( FString( FString { range: 174..190, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 176..189, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..183, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..180, value: Int( 1, @@ -766,7 +766,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..183, value: Int( 2, @@ -804,41 +804,41 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..217, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..217, value: FStringValue { inner: Single( FString( FString { range: 191..217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 193..216, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..210, value: FStringValue { inner: Single( FString( FString { range: 194..210, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 196..209, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..203, value: Float( 3.1415, @@ -855,12 +855,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 205..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 205..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".1f", }, ), @@ -886,12 +886,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 211..215, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 211..215, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "*^20", }, ), @@ -916,18 +916,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..253, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..253, items: [ DictItem { key: Some( FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..248, value: FStringValue { inner: Concatenated( @@ -935,7 +935,7 @@ Module( Literal( StringLiteral { range: 220..226, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo ", flags: StringLiteralFlags { quote_style: Double, @@ -947,26 +947,26 @@ Module( FString( FString { range: 227..242, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 229..233, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "bar ", }, ), Interpolation( InterpolatedElement { range: 233..240, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..239, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..235, id: Name("x"), ctx: Load, @@ -975,7 +975,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..239, id: Name("y"), ctx: Load, @@ -991,7 +991,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 240..241, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " ", }, ), @@ -1006,7 +1006,7 @@ Module( Literal( StringLiteral { range: 243..248, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "baz", flags: StringLiteralFlags { quote_style: Double, @@ -1023,7 +1023,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..252, value: Int( 10, @@ -1038,11 +1038,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..345, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..263, id: Name("foo"), ctx: Load, @@ -1051,20 +1051,20 @@ Module( cases: [ MatchCase { range: 269..293, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 274..279, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..279, value: StringLiteralValue { inner: Single( StringLiteral { range: 274..279, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "one", flags: StringLiteralFlags { quote_style: Double, @@ -1082,7 +1082,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 289..293, }, ), @@ -1090,14 +1090,14 @@ Module( }, MatchCase { range: 298..345, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 303..331, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 303..331, value: StringLiteralValue { inner: Concatenated( @@ -1105,7 +1105,7 @@ Module( strings: [ StringLiteral { range: 303..316, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "implicitly ", flags: StringLiteralFlags { quote_style: Double, @@ -1115,7 +1115,7 @@ Module( }, StringLiteral { range: 317..331, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "concatenated", flags: StringLiteralFlags { quote_style: Double, @@ -1136,7 +1136,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 341..345, }, ), @@ -1147,33 +1147,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 347..364, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 347..364, value: FStringValue { inner: Single( FString( FString { range: 347..364, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 349..350, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\", }, ), Interpolation( InterpolatedElement { range: 350..355, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..354, id: Name("foo"), ctx: Load, @@ -1187,17 +1187,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 355..356, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\", }, ), Interpolation( InterpolatedElement { range: 356..363, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 357..360, id: Name("bar"), ctx: Load, @@ -1208,12 +1208,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 361..362, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 361..362, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\", }, ), @@ -1238,23 +1238,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 365..379, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 365..379, value: FStringValue { inner: Single( FString( FString { range: 365..379, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 367..378, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\{foo\\}", }, ), @@ -1274,26 +1274,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 380..420, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 380..420, value: FStringValue { inner: Single( FString( FString { range: 380..420, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 384..417, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 390..393, id: Name("foo"), ctx: Load, @@ -1304,12 +1304,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 394..416, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 394..416, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x\n y\n z\n", }, ), @@ -1334,26 +1334,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..439, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..439, value: FStringValue { inner: Single( FString( FString { range: 421..439, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 423..438, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 428..431, id: Name("foo"), ctx: Load, @@ -1385,33 +1385,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 441..486, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 441..486, value: FStringValue { inner: Single( FString( FString { range: 441..486, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 443..450, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "normal ", }, ), Interpolation( InterpolatedElement { range: 450..455, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 451..454, id: Name("foo"), ctx: Load, @@ -1425,17 +1425,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 455..468, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " {another} ", }, ), Interpolation( InterpolatedElement { range: 468..473, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 469..472, id: Name("bar"), ctx: Load, @@ -1449,17 +1449,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 473..476, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " {", }, ), Interpolation( InterpolatedElement { range: 476..483, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 477..482, id: Name("three"), ctx: Load, @@ -1473,7 +1473,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 483..485, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "}", }, ), @@ -1493,33 +1493,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 487..529, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 487..529, value: FStringValue { inner: Single( FString( FString { range: 487..529, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 489..496, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "normal ", }, ), Interpolation( InterpolatedElement { range: 496..503, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 497..500, id: Name("foo"), ctx: Load, @@ -1533,17 +1533,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 503..504, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " ", }, ), Interpolation( InterpolatedElement { range: 504..511, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 505..508, id: Name("bar"), ctx: Load, @@ -1557,17 +1557,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 511..512, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " ", }, ), Interpolation( InterpolatedElement { range: 512..519, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 513..516, id: Name("baz"), ctx: Load, @@ -1581,17 +1581,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 519..520, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " ", }, ), Interpolation( InterpolatedElement { range: 520..528, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 521..527, id: Name("foobar"), ctx: Load, @@ -1618,33 +1618,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 530..549, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 530..549, value: FStringValue { inner: Single( FString( FString { range: 530..549, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 532..539, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "normal ", }, ), Interpolation( InterpolatedElement { range: 539..548, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 540..541, id: Name("x"), ctx: Load, @@ -1655,12 +1655,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 542..547, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 542..547, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "y + 2", }, ), @@ -1685,26 +1685,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 550..568, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 550..568, value: FStringValue { inner: Single( FString( FString { range: 550..568, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 552..567, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 553..554, id: Name("x"), ctx: Load, @@ -1715,28 +1715,28 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 555..566, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 555..566, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 556..565, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 556..563, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 556..559, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 557..558, value: Int( 1, @@ -1749,14 +1749,14 @@ Module( attr: Identifier { id: Name("pop"), range: 560..563, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 563..565, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1788,45 +1788,43 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 569..588, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 569..588, value: FStringValue { inner: Single( FString( FString { range: 569..588, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 571..587, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 573..585, parameters: Some( Parameters { range: 580..581, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 580..581, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 580..581, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 580..581, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1840,12 +1838,12 @@ Module( ), body: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 582..585, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 583..584, id: Name("x"), ctx: Load, @@ -1877,26 +1875,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 589..597, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 589..597, value: FStringValue { inner: Single( FString( FString { range: 589..597, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 591..596, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 592..593, id: Name("x"), ctx: Load, @@ -1928,26 +1926,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 598..611, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 598..611, value: FStringValue { inner: Single( FString( FString { range: 598..611, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 600..610, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 605..606, id: Name("x"), ctx: Load, @@ -1979,26 +1977,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 612..621, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 612..621, value: FStringValue { inner: Single( FString( FString { range: 612..621, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 614..620, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 615..616, id: Name("x"), ctx: Load, @@ -2030,26 +2028,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 622..636, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 622..636, value: FStringValue { inner: Single( FString( FString { range: 622..636, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 624..635, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 625..626, id: Name("x"), ctx: Load, @@ -2060,12 +2058,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 627..634, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 627..634, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f!r =", }, ), @@ -2090,26 +2088,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 637..653, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 637..653, value: FStringValue { inner: Single( FString( FString { range: 637..653, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 639..652, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 640..641, id: Name("x"), ctx: Load, @@ -2125,12 +2123,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 648..651, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 648..651, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f", }, ), @@ -2155,26 +2153,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 654..667, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 654..667, value: FStringValue { inner: Single( FString( FString { range: 654..667, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 656..666, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 657..658, id: Name("x"), ctx: Load, @@ -2185,12 +2183,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 659..665, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 659..665, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f=!r", }, ), @@ -2215,11 +2213,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 668..682, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 668..682, value: FStringValue { inner: Concatenated( @@ -2227,7 +2225,7 @@ Module( Literal( StringLiteral { range: 668..675, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello", flags: StringLiteralFlags { quote_style: Double, @@ -2239,15 +2237,15 @@ Module( FString( FString { range: 676..682, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 678..681, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 679..680, id: Name("x"), ctx: Load, @@ -2275,11 +2273,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 683..696, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 683..696, value: FStringValue { inner: Concatenated( @@ -2287,15 +2285,15 @@ Module( FString( FString { range: 683..689, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 685..688, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 686..687, id: Name("x"), ctx: Load, @@ -2317,15 +2315,15 @@ Module( FString( FString { range: 690..696, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 692..695, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 693..694, id: Name("y"), ctx: Load, @@ -2353,11 +2351,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 697..711, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 697..711, value: FStringValue { inner: Concatenated( @@ -2365,15 +2363,15 @@ Module( FString( FString { range: 697..703, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 699..702, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 700..701, id: Name("x"), ctx: Load, @@ -2395,7 +2393,7 @@ Module( Literal( StringLiteral { range: 704..711, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world", flags: StringLiteralFlags { quote_style: Double, @@ -2413,38 +2411,38 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 712..756, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 712..756, value: FStringValue { inner: Single( FString( FString { range: 712..756, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 714..739, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Invalid args in command: ", }, ), Interpolation( InterpolatedElement { range: 739..755, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 740..754, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 740..747, id: Name("command"), ctx: Load, @@ -2452,11 +2450,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 749..754, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 750..754, id: Name("args"), ctx: Load, @@ -2491,11 +2489,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 757..775, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 757..775, value: FStringValue { inner: Concatenated( @@ -2503,7 +2501,7 @@ Module( Literal( StringLiteral { range: 757..762, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo", flags: StringLiteralFlags { quote_style: Double, @@ -2515,15 +2513,15 @@ Module( FString( FString { range: 763..769, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 765..768, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 766..767, id: Name("x"), ctx: Load, @@ -2545,7 +2543,7 @@ Module( Literal( StringLiteral { range: 770..775, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "bar", flags: StringLiteralFlags { quote_style: Double, @@ -2563,11 +2561,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 776..825, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 782..823, value: FStringValue { inner: Concatenated( @@ -2575,12 +2573,12 @@ Module( FString( FString { range: 782..786, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 784..785, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", }, ), @@ -2595,12 +2593,12 @@ Module( FString( FString { range: 791..795, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 793..794, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "b", }, ), @@ -2615,7 +2613,7 @@ Module( Literal( StringLiteral { range: 800..803, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "c", flags: StringLiteralFlags { quote_style: Double, @@ -2627,12 +2625,12 @@ Module( FString( FString { range: 808..813, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 811..812, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "d", }, ), @@ -2649,12 +2647,12 @@ Module( FString( FString { range: 818..823, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 821..822, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "e", }, ), @@ -2677,11 +2675,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 850..879, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 850..879, value: FStringValue { inner: Concatenated( @@ -2689,7 +2687,7 @@ Module( Literal( StringLiteral { range: 850..856, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo", flags: StringLiteralFlags { quote_style: Double, @@ -2701,15 +2699,15 @@ Module( FString( FString { range: 857..865, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 859..864, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 860..863, id: Name("bar"), ctx: Load, @@ -2731,7 +2729,7 @@ Module( Literal( StringLiteral { range: 866..871, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "baz", flags: StringLiteralFlags { quote_style: Double, @@ -2743,7 +2741,7 @@ Module( Literal( StringLiteral { range: 872..879, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " some", flags: StringLiteralFlags { quote_style: Double, @@ -2761,11 +2759,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 880..909, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 880..909, value: FStringValue { inner: Concatenated( @@ -2773,7 +2771,7 @@ Module( Literal( StringLiteral { range: 880..885, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo", flags: StringLiteralFlags { quote_style: Double, @@ -2785,15 +2783,15 @@ Module( FString( FString { range: 886..894, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 888..893, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 889..892, id: Name("bar"), ctx: Load, @@ -2815,7 +2813,7 @@ Module( Literal( StringLiteral { range: 895..901, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "baz", flags: StringLiteralFlags { quote_style: Double, @@ -2827,7 +2825,7 @@ Module( Literal( StringLiteral { range: 902..909, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " some", flags: StringLiteralFlags { quote_style: Double, @@ -2845,11 +2843,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 910..939, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 910..939, value: FStringValue { inner: Concatenated( @@ -2857,7 +2855,7 @@ Module( Literal( StringLiteral { range: 910..915, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo", flags: StringLiteralFlags { quote_style: Double, @@ -2869,15 +2867,15 @@ Module( FString( FString { range: 916..924, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 918..923, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 919..922, id: Name("bar"), ctx: Load, @@ -2899,7 +2897,7 @@ Module( Literal( StringLiteral { range: 925..930, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "baz", flags: StringLiteralFlags { quote_style: Double, @@ -2911,7 +2909,7 @@ Module( Literal( StringLiteral { range: 931..939, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " some", flags: StringLiteralFlags { quote_style: Double, @@ -2929,11 +2927,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 940..978, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 940..978, value: FStringValue { inner: Concatenated( @@ -2941,7 +2939,7 @@ Module( Literal( StringLiteral { range: 940..946, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo", flags: StringLiteralFlags { quote_style: Double, @@ -2953,22 +2951,22 @@ Module( FString( FString { range: 947..966, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 949..953, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "bar ", }, ), Interpolation( InterpolatedElement { range: 953..958, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 954..957, id: Name("baz"), ctx: Load, @@ -2982,7 +2980,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 958..965, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " really", }, ), @@ -2997,7 +2995,7 @@ Module( Literal( StringLiteral { range: 967..973, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "bar", flags: StringLiteralFlags { quote_style: Double, @@ -3009,7 +3007,7 @@ Module( Literal( StringLiteral { range: 974..978, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "no", flags: StringLiteralFlags { quote_style: Double, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap index 80e25b5146..6dcaa77c6b 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/generator.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..482, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, value: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, id: Name("x"), ctx: Load, @@ -29,10 +29,10 @@ Module( generators: [ Comprehension { range: 3..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..13, id: Name("target"), ctx: Store, @@ -40,7 +40,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..21, id: Name("iter"), ctx: Load, @@ -57,15 +57,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..51, value: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..51, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("x"), ctx: Load, @@ -74,10 +74,10 @@ Module( generators: [ Comprehension { range: 26..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..42, id: Name("target"), ctx: Store, @@ -85,7 +85,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..50, id: Name("iter"), ctx: Load, @@ -102,15 +102,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..100, value: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..100, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, id: Name("x"), ctx: Load, @@ -119,10 +119,10 @@ Module( generators: [ Comprehension { range: 55..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..65, id: Name("target"), ctx: Store, @@ -130,7 +130,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..73, id: Name("iter"), ctx: Load, @@ -139,11 +139,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..83, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("x"), ctx: Load, @@ -155,7 +155,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, id: Name("y"), ctx: Load, @@ -166,13 +166,13 @@ Module( ), BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..94, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..88, id: Name("a"), ctx: Load, @@ -180,7 +180,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, id: Name("b"), ctx: Load, @@ -191,7 +191,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, id: Name("c"), ctx: Load, @@ -208,15 +208,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..166, value: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..166, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, id: Name("x"), ctx: Load, @@ -225,10 +225,10 @@ Module( generators: [ Comprehension { range: 104..135, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..115, id: Name("target1"), ctx: Store, @@ -236,7 +236,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..124, id: Name("iter1"), ctx: Load, @@ -245,13 +245,13 @@ Module( ifs: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..135, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, id: Name("x"), ctx: Load, @@ -259,7 +259,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..135, id: Name("y"), ctx: Load, @@ -273,10 +273,10 @@ Module( }, Comprehension { range: 136..165, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..147, id: Name("target2"), ctx: Store, @@ -284,7 +284,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..156, id: Name("iter2"), ctx: Load, @@ -293,11 +293,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..165, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..161, id: Name("a"), ctx: Load, @@ -309,7 +309,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..165, id: Name("b"), ctx: Load, @@ -329,15 +329,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..238, value: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..238, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..169, id: Name("x"), ctx: Load, @@ -346,10 +346,10 @@ Module( generators: [ Comprehension { range: 170..201, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..181, id: Name("target1"), ctx: Store, @@ -357,7 +357,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..190, id: Name("iter1"), ctx: Load, @@ -366,13 +366,13 @@ Module( ifs: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..201, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..195, id: Name("x"), ctx: Load, @@ -380,7 +380,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..201, id: Name("y"), ctx: Load, @@ -394,10 +394,10 @@ Module( }, Comprehension { range: 202..237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 212..219, id: Name("target2"), ctx: Store, @@ -405,7 +405,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..228, id: Name("iter2"), ctx: Load, @@ -414,11 +414,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..237, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..233, id: Name("a"), ctx: Load, @@ -430,7 +430,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..237, id: Name("b"), ctx: Load, @@ -450,19 +450,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..282, value: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..282, elt: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..270, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..261, id: Name("x"), ctx: Store, @@ -470,11 +470,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..270, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..266, id: Name("y"), ctx: Load, @@ -483,7 +483,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..270, value: Int( 1, @@ -497,10 +497,10 @@ Module( generators: [ Comprehension { range: 271..281, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 275..276, id: Name("y"), ctx: Store, @@ -508,7 +508,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 280..281, id: Name("z"), ctx: Load, @@ -525,19 +525,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..326, value: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..326, elt: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..314, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..307, id: Name("y"), ctx: Load, @@ -545,7 +545,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..302, id: Name("x"), ctx: Load, @@ -553,7 +553,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..314, id: Name("y"), ctx: Load, @@ -564,10 +564,10 @@ Module( generators: [ Comprehension { range: 315..325, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..320, id: Name("y"), ctx: Store, @@ -575,7 +575,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..325, id: Name("z"), ctx: Load, @@ -592,25 +592,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..481, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..481, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..348, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..343, value: StringLiteralValue { inner: Single( StringLiteral { range: 340..343, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " ", flags: StringLiteralFlags { quote_style: Double, @@ -625,22 +625,22 @@ Module( attr: Identifier { id: Name("join"), range: 344..348, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 348..481, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 354..479, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 354..357, id: Name("sql"), ctx: Load, @@ -649,10 +649,10 @@ Module( generators: [ Comprehension { range: 362..479, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 366..369, id: Name("sql"), ctx: Store, @@ -660,16 +660,16 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 373..479, elts: [ If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..420, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 405..410, id: Name("limit"), ctx: Load, @@ -677,17 +677,17 @@ Module( ), body: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..401, left: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..393, value: StringLiteralValue { inner: Single( StringLiteral { range: 383..393, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "LIMIT %d", flags: StringLiteralFlags { quote_style: Double, @@ -702,7 +702,7 @@ Module( op: Mod, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 396..401, id: Name("limit"), ctx: Load, @@ -712,7 +712,7 @@ Module( ), orelse: NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 416..420, }, ), @@ -720,11 +720,11 @@ Module( ), If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 430..472, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 456..462, id: Name("offset"), ctx: Load, @@ -732,17 +732,17 @@ Module( ), body: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 431..451, left: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 431..442, value: StringLiteralValue { inner: Single( StringLiteral { range: 431..442, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "OFFSET %d", flags: StringLiteralFlags { quote_style: Double, @@ -757,7 +757,7 @@ Module( op: Mod, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 445..451, id: Name("offset"), ctx: Load, @@ -767,7 +767,7 @@ Module( ), orelse: NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 468..472, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap index f21914594f..98ed6f9e96 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap @@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/if.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..423, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..9, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("a"), ctx: Load, @@ -35,7 +35,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, id: Name("b"), ctx: Load, @@ -47,15 +47,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..35, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..35, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("x"), ctx: Load, @@ -63,11 +63,11 @@ Module( ), body: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("f"), ctx: Load, @@ -75,7 +75,7 @@ Module( ), arguments: Arguments { range: 18..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -83,7 +83,7 @@ Module( ), orelse: NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..35, }, ), @@ -93,15 +93,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..61, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..61, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("b"), ctx: Load, @@ -109,7 +109,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, id: Name("a"), ctx: Load, @@ -117,11 +117,11 @@ Module( ), orelse: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..61, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, id: Name("d"), ctx: Load, @@ -129,7 +129,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..49, id: Name("c"), ctx: Load, @@ -137,7 +137,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("e"), ctx: Load, @@ -151,19 +151,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..84, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..84, test: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..76, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, value: Int( 1, @@ -176,7 +176,7 @@ Module( comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, value: Int( 0, @@ -188,11 +188,11 @@ Module( ), body: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..67, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, value: Int( 1, @@ -202,7 +202,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, id: Name("x"), ctx: Load, @@ -212,12 +212,12 @@ Module( ), orelse: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..84, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, value: Int( 1, @@ -232,15 +232,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..108, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..108, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, id: Name("x"), ctx: Load, @@ -248,13 +248,13 @@ Module( ), body: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..92, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..86, id: Name("a"), ctx: Load, @@ -262,7 +262,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..92, id: Name("b"), ctx: Load, @@ -273,7 +273,7 @@ Module( ), orelse: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..108, value: false, }, @@ -284,15 +284,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..127, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..127, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, id: Name("y"), ctx: Load, @@ -300,11 +300,11 @@ Module( ), body: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..115, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..110, id: Name("x"), ctx: Load, @@ -316,7 +316,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..115, id: Name("y"), ctx: Load, @@ -327,7 +327,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..127, id: Name("x"), ctx: Load, @@ -339,21 +339,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..154, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..154, test: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..143, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..137, id: Name("a"), ctx: Load, @@ -361,7 +361,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..143, id: Name("b"), ctx: Load, @@ -372,14 +372,14 @@ Module( ), body: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..132, value: true, }, ), orelse: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..154, value: false, }, @@ -390,16 +390,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..171, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..171, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..156, value: Int( 1, @@ -408,11 +408,11 @@ Module( ), If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..171, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..164, id: Name("a"), ctx: Load, @@ -420,7 +420,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..159, value: Int( 1, @@ -429,7 +429,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..171, id: Name("c"), ctx: Load, @@ -446,22 +446,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..240, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..240, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..223, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..215, id: Name("x"), ctx: Load, @@ -469,26 +469,24 @@ Module( ), orelse: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 229..240, parameters: Some( Parameters { range: 236..237, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 236..237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 236..237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 236..237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -502,7 +500,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..240, id: Name("y"), ctx: Load, @@ -516,20 +514,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 302..323, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 302..323, test: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 308..315, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 314..315, id: Name("x"), ctx: Load, @@ -540,7 +538,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 302..303, id: Name("x"), ctx: Load, @@ -548,7 +546,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 322..323, id: Name("y"), ctx: Load, @@ -560,19 +558,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..350, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..350, test: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 330..342, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 341..342, id: Name("x"), ctx: Load, @@ -582,7 +580,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..325, id: Name("x"), ctx: Load, @@ -590,7 +588,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 349..350, id: Name("y"), ctx: Load, @@ -602,34 +600,32 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..376, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..376, test: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 357..368, parameters: Some( Parameters { range: 364..365, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 364..365, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 364..365, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 364..365, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -643,7 +639,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 367..368, id: Name("x"), ctx: Load, @@ -653,7 +649,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..352, id: Name("x"), ctx: Load, @@ -661,7 +657,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 375..376, id: Name("y"), ctx: Load, @@ -673,15 +669,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 408..423, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 409..422, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 414..415, id: Name("y"), ctx: Load, @@ -689,7 +685,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 409..410, id: Name("x"), ctx: Load, @@ -697,7 +693,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..422, id: Name("z"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap index 9e614f6c7e..29db11b942 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/lambda.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..530, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, parameters: None, body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("a"), ctx: Load, @@ -33,16 +33,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..19, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..19, parameters: None, body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, value: Int( 1, @@ -55,30 +55,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..31, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..31, parameters: Some( Parameters { range: 27..28, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 27..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 27..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 27..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -92,7 +90,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..31, value: Int( 1, @@ -105,30 +103,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..48, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..48, parameters: Some( Parameters { range: 39..43, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -136,14 +132,14 @@ Module( }, ParameterWithDefault { range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -157,7 +153,7 @@ Module( ), body: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..48, }, ), @@ -167,30 +163,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..66, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..66, parameters: Some( Parameters { range: 56..63, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -198,14 +192,14 @@ Module( }, ParameterWithDefault { range: 59..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 59..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 59..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -213,14 +207,14 @@ Module( }, ParameterWithDefault { range: 62..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 62..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 62..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -234,7 +228,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, value: Int( 1, @@ -247,30 +241,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..90, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..90, parameters: Some( Parameters { range: 74..87, - 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("a"), range: 74..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -278,21 +270,21 @@ Module( }, ParameterWithDefault { range: 77..81, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 77..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 77..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..81, value: Int( 20, @@ -303,21 +295,21 @@ Module( }, ParameterWithDefault { range: 83..87, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 83..84, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 83..84, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..87, value: Int( 30, @@ -334,7 +326,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, value: Int( 1, @@ -347,30 +339,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..109, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..109, parameters: Some( Parameters { range: 98..102, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 98..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 98..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 98..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -378,14 +368,14 @@ Module( }, ParameterWithDefault { range: 101..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 101..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 101..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -399,11 +389,11 @@ Module( ), body: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..109, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, id: Name("x"), ctx: Load, @@ -412,7 +402,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, id: Name("y"), ctx: Load, @@ -426,30 +416,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..130, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..130, parameters: Some( Parameters { range: 117..123, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 117..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 117..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 117..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -457,21 +445,21 @@ Module( }, ParameterWithDefault { range: 120..123, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 120..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("z"), range: 120..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, value: Int( 1, @@ -488,11 +476,11 @@ Module( ), body: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..130, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..126, id: Name("z"), ctx: Load, @@ -501,7 +489,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, id: Name("y"), ctx: Load, @@ -515,28 +503,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..143, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..143, parameters: Some( Parameters { range: 138..140, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 138..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 139..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -547,7 +533,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..143, id: Name("a"), ctx: Load, @@ -559,28 +545,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..166, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..166, parameters: Some( Parameters { range: 151..161, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 151..153, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 152..153, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -588,14 +572,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 155..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 155..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("z"), range: 155..156, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -603,21 +587,21 @@ Module( }, ParameterWithDefault { range: 158..161, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 158..159, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 158..159, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..161, value: Int( 0, @@ -632,7 +616,7 @@ Module( ), body: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..166, }, ), @@ -642,32 +626,30 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..187, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..187, parameters: Some( Parameters { range: 174..184, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, kwonlyargs: [ ParameterWithDefault { range: 177..178, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 177..178, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 177..178, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -675,14 +657,14 @@ Module( }, ParameterWithDefault { range: 180..181, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 180..181, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 180..181, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -690,14 +672,14 @@ Module( }, ParameterWithDefault { range: 183..184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 183..184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 183..184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -709,7 +691,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..187, value: Int( 1, @@ -722,32 +704,30 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..214, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..214, parameters: Some( Parameters { range: 195..211, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, kwonlyargs: [ ParameterWithDefault { range: 198..199, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 198..199, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 198..199, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -755,21 +735,21 @@ Module( }, ParameterWithDefault { range: 201..205, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 201..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 201..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 203..205, value: Int( 20, @@ -780,21 +760,21 @@ Module( }, ParameterWithDefault { range: 207..211, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 207..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 207..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 209..211, value: Int( 30, @@ -809,7 +789,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..214, value: Int( 1, @@ -822,30 +802,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..241, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..241, parameters: Some( Parameters { range: 222..238, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 222..223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 222..223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 222..223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -853,14 +831,14 @@ Module( }, ParameterWithDefault { range: 225..226, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 225..226, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 225..226, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -868,14 +846,14 @@ Module( }, ParameterWithDefault { range: 228..229, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 228..229, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 228..229, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -886,14 +864,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 234..235, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 234..235, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 234..235, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -901,14 +879,14 @@ Module( }, ParameterWithDefault { range: 237..238, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 237..238, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 237..238, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -920,7 +898,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..241, value: Int( 0, @@ -933,18 +911,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..262, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..262, parameters: Some( Parameters { range: 249..257, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -952,11 +928,11 @@ Module( kwarg: Some( Parameter { range: 249..257, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 251..257, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -965,11 +941,11 @@ Module( ), body: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..262, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..260, id: Name("f"), ctx: Load, @@ -977,7 +953,7 @@ Module( ), arguments: Arguments { range: 260..262, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -989,28 +965,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 263..294, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 263..294, parameters: Some( Parameters { range: 270..285, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 270..275, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 271..275, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1019,11 +993,11 @@ Module( kwarg: Some( Parameter { range: 277..285, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 279..285, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1032,15 +1006,15 @@ Module( ), body: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 287..294, left: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 287..290, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 287..288, id: Name("f"), ctx: Load, @@ -1048,7 +1022,7 @@ Module( ), arguments: Arguments { range: 288..290, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1057,7 +1031,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 293..294, value: Int( 1, @@ -1072,28 +1046,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 295..334, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 295..334, parameters: Some( Parameters { range: 302..325, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 302..307, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 303..307, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1101,14 +1073,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 309..310, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 309..310, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 309..310, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1116,21 +1088,21 @@ Module( }, ParameterWithDefault { range: 312..315, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 312..313, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 312..313, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 314..315, value: Int( 1, @@ -1143,11 +1115,11 @@ Module( kwarg: Some( Parameter { range: 317..325, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 319..325, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1156,15 +1128,15 @@ Module( ), body: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..334, left: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..330, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..328, id: Name("f"), ctx: Load, @@ -1172,7 +1144,7 @@ Module( ), arguments: Arguments { range: 328..330, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1181,7 +1153,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 333..334, value: Int( 1, @@ -1196,29 +1168,27 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..351, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..351, parameters: Some( Parameters { range: 342..346, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 342..343, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 342..343, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 342..343, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1233,7 +1203,7 @@ Module( ), body: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..351, }, ), @@ -1243,29 +1213,27 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 352..371, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 352..371, parameters: Some( Parameters { range: 359..366, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 359..360, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 359..360, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 359..360, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1275,14 +1243,14 @@ Module( args: [ ParameterWithDefault { range: 365..366, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 365..366, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 365..366, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1296,7 +1264,7 @@ Module( ), body: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 368..371, }, ), @@ -1306,36 +1274,34 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 372..391, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 372..391, parameters: Some( Parameters { range: 379..386, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 379..382, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 379..380, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 379..380, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 381..382, value: Int( 1, @@ -1353,7 +1319,7 @@ Module( ), body: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 388..391, }, ), @@ -1363,29 +1329,27 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 392..417, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 392..417, parameters: Some( Parameters { range: 399..412, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 399..400, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 399..400, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 399..400, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1393,14 +1357,14 @@ Module( }, ParameterWithDefault { range: 402..403, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 402..403, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 402..403, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1412,14 +1376,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 411..412, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 411..412, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 411..412, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1431,7 +1395,7 @@ Module( ), body: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 414..417, }, ), @@ -1441,37 +1405,35 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 418..440, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 418..440, parameters: Some( Parameters { range: 425..435, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 425..429, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 425..427, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kw"), range: 425..427, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 428..429, value: Int( 1, @@ -1485,14 +1447,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 434..435, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 434..435, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 434..435, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1504,7 +1466,7 @@ Module( ), body: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 437..440, }, ), @@ -1514,29 +1476,27 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 441..467, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 441..467, parameters: Some( Parameters { range: 448..464, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 448..449, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 448..449, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 448..449, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1544,21 +1504,21 @@ Module( }, ParameterWithDefault { range: 451..455, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 451..452, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 451..452, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 453..455, value: Int( 20, @@ -1571,21 +1531,21 @@ Module( args: [ ParameterWithDefault { range: 460..464, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 460..461, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 460..461, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 462..464, value: Int( 30, @@ -1602,7 +1562,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 466..467, value: Int( 1, @@ -1615,29 +1575,27 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 468..497, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 468..497, parameters: Some( Parameters { range: 475..494, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 475..476, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 475..476, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 475..476, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1645,14 +1603,14 @@ Module( }, ParameterWithDefault { range: 478..479, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 478..479, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 478..479, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1662,14 +1620,14 @@ Module( args: [ ParameterWithDefault { range: 484..485, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 484..485, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 484..485, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1680,14 +1638,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 490..491, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 490..491, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 490..491, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1695,14 +1653,14 @@ Module( }, ParameterWithDefault { range: 493..494, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 493..494, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 493..494, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1714,7 +1672,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 496..497, value: Int( 0, @@ -1727,29 +1685,27 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 498..530, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 498..530, parameters: Some( Parameters { range: 505..527, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 505..506, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 505..506, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 505..506, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1757,14 +1713,14 @@ Module( }, ParameterWithDefault { range: 508..509, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 508..509, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 508..509, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1774,14 +1730,14 @@ Module( args: [ ParameterWithDefault { range: 514..515, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 514..515, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 514..515, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1791,11 +1747,11 @@ Module( vararg: Some( Parameter { range: 517..519, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 518..519, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1803,14 +1759,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 521..522, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 521..522, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 521..522, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1820,11 +1776,11 @@ Module( kwarg: Some( Parameter { range: 524..527, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("f"), range: 526..527, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1833,7 +1789,7 @@ Module( ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 529..530, value: Int( 0, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap index dec8d0d279..a12de668bf 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/list.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..384, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..17, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..17, elts: [], ctx: Load, @@ -26,16 +26,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..21, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..21, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, value: Int( 1, @@ -50,16 +50,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..26, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..26, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, value: Int( 1, @@ -74,16 +74,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..36, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..36, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, value: Int( 1, @@ -92,7 +92,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..32, value: Int( 2, @@ -101,7 +101,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, value: Int( 3, @@ -116,16 +116,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..47, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..47, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, value: Int( 1, @@ -134,7 +134,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, value: Int( 2, @@ -143,7 +143,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, value: Int( 3, @@ -158,11 +158,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..78, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..78, elts: [], ctx: Load, @@ -172,16 +172,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..92, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..92, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, value: Int( 1, @@ -196,16 +196,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..114, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..114, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, value: Int( 1, @@ -214,7 +214,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..111, value: Int( 2, @@ -229,26 +229,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..132, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..132, elts: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..131, elts: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..130, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, value: Int( 1, @@ -271,21 +271,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..149, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..149, elts: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..140, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, value: Int( 1, @@ -294,7 +294,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 138..139, value: Int( 2, @@ -307,12 +307,12 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..148, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..144, value: Int( 3, @@ -321,7 +321,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, value: Int( 4, @@ -340,20 +340,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..178, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..178, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..177, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..172, id: Name("x"), ctx: Store, @@ -361,7 +361,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..177, value: Int( 2, @@ -378,20 +378,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..188, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..188, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 180..186, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 180..181, id: Name("x"), ctx: Store, @@ -399,7 +399,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..186, value: Int( 2, @@ -416,16 +416,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..203, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..203, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..191, value: Int( 1, @@ -434,11 +434,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..199, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..194, id: Name("x"), ctx: Store, @@ -446,7 +446,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 198..199, value: Int( 2, @@ -457,7 +457,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..202, value: Int( 3, @@ -472,16 +472,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..233, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..233, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..225, value: Int( 1, @@ -490,11 +490,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..229, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..229, id: Name("x"), ctx: Load, @@ -505,7 +505,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..232, value: Int( 3, @@ -520,16 +520,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..248, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..248, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..236, value: Int( 1, @@ -538,15 +538,15 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..244, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..244, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..240, id: Name("x"), ctx: Load, @@ -555,7 +555,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 243..244, id: Name("y"), ctx: Load, @@ -568,7 +568,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..247, value: Int( 3, @@ -583,20 +583,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..334, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..334, elts: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 272..277, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 272..273, value: Int( 1, @@ -606,7 +606,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 276..277, value: Int( 2, @@ -617,12 +617,12 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 279..291, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 280..281, value: Int( 1, @@ -631,7 +631,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 283..284, value: Int( 2, @@ -640,7 +640,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..287, value: Int( 3, @@ -649,7 +649,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 289..290, value: Int( 4, @@ -662,12 +662,12 @@ Module( ), Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 293..306, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 294..295, id: Name("a"), ctx: Load, @@ -675,11 +675,11 @@ Module( ), BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 297..302, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 297..298, id: Name("b"), ctx: Load, @@ -688,7 +688,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..302, id: Name("c"), ctx: Load, @@ -698,7 +698,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 304..305, id: Name("d"), ctx: Load, @@ -711,12 +711,12 @@ Module( ), Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 308..317, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 309..310, id: Name("a"), ctx: Load, @@ -724,7 +724,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..313, id: Name("b"), ctx: Load, @@ -732,7 +732,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 315..316, id: Name("c"), ctx: Load, @@ -743,14 +743,14 @@ Module( ), Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..325, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 320..321, id: Name("a"), ctx: Load, @@ -759,7 +759,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 323..324, value: Int( 1, @@ -772,11 +772,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..333, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..328, id: Name("x"), ctx: Store, @@ -784,7 +784,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 332..333, value: Int( 2, @@ -801,20 +801,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..383, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..383, elts: [ Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..382, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..341, id: Name("call1"), ctx: Load, @@ -822,19 +822,19 @@ Module( ), arguments: Arguments { range: 341..382, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 342..381, elt: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 342..361, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 342..347, id: Name("call2"), ctx: Load, @@ -842,19 +842,19 @@ Module( ), arguments: Arguments { range: 347..361, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..360, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..358, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..353, id: Name("value"), ctx: Load, @@ -863,14 +863,14 @@ Module( attr: Identifier { id: Name("attr"), range: 354..358, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 358..360, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -884,10 +884,10 @@ Module( generators: [ Comprehension { range: 362..381, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 366..373, id: Name("element"), ctx: Store, @@ -895,7 +895,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 377..381, id: Name("iter"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap index de7a7eb783..6f1310b33d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/list_comprehen ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..776, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -26,11 +26,11 @@ Module( ], value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..26, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("y"), ctx: Load, @@ -39,10 +39,10 @@ Module( generators: [ Comprehension { range: 7..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, id: Name("y"), ctx: Store, @@ -50,12 +50,12 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..25, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, value: Int( 1, @@ -64,7 +64,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, value: Int( 2, @@ -73,7 +73,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, value: Int( 3, @@ -95,15 +95,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..49, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..49, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("x"), ctx: Load, @@ -112,10 +112,10 @@ Module( generators: [ Comprehension { range: 31..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("i"), ctx: Store, @@ -123,11 +123,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..48, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..45, id: Name("range"), ctx: Load, @@ -135,11 +135,11 @@ Module( ), arguments: Arguments { range: 45..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, value: Int( 5, @@ -161,15 +161,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..91, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..91, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, id: Name("b"), ctx: Load, @@ -178,10 +178,10 @@ Module( generators: [ Comprehension { range: 53..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, id: Name("c"), ctx: Store, @@ -189,7 +189,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("d"), ctx: Load, @@ -198,11 +198,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..73, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..68, id: Name("x"), ctx: Load, @@ -214,7 +214,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("w"), ctx: Load, @@ -225,13 +225,13 @@ Module( ), BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..85, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("y"), ctx: Load, @@ -239,7 +239,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..85, id: Name("yy"), ctx: Load, @@ -250,7 +250,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, id: Name("z"), ctx: Load, @@ -266,15 +266,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..137, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..137, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, id: Name("a"), ctx: Load, @@ -283,10 +283,10 @@ Module( generators: [ Comprehension { range: 95..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, id: Name("b"), ctx: Store, @@ -294,7 +294,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, id: Name("c"), ctx: Load, @@ -303,13 +303,13 @@ Module( ifs: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..116, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..110, id: Name("d"), ctx: Load, @@ -317,7 +317,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..116, id: Name("e"), ctx: Load, @@ -331,10 +331,10 @@ Module( }, Comprehension { range: 117..136, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..122, id: Name("f"), ctx: Store, @@ -342,7 +342,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..127, id: Name("j"), ctx: Load, @@ -351,11 +351,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..136, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..132, id: Name("k"), ctx: Load, @@ -367,7 +367,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, id: Name("h"), ctx: Load, @@ -386,15 +386,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 138..189, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 138..189, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..140, id: Name("a"), ctx: Load, @@ -403,10 +403,10 @@ Module( generators: [ Comprehension { range: 141..162, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..146, id: Name("b"), ctx: Store, @@ -414,7 +414,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..151, id: Name("c"), ctx: Load, @@ -423,13 +423,13 @@ Module( ifs: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..162, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..156, id: Name("d"), ctx: Load, @@ -437,7 +437,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 161..162, id: Name("e"), ctx: Load, @@ -451,10 +451,10 @@ Module( }, Comprehension { range: 163..188, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 173..174, id: Name("f"), ctx: Store, @@ -462,7 +462,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..179, id: Name("j"), ctx: Load, @@ -471,11 +471,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..188, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..184, id: Name("k"), ctx: Load, @@ -487,7 +487,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 187..188, id: Name("h"), ctx: Load, @@ -506,15 +506,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..209, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..209, elt: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..192, value: Int( 1, @@ -524,10 +524,10 @@ Module( generators: [ Comprehension { range: 193..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..198, id: Name("i"), ctx: Store, @@ -535,11 +535,11 @@ Module( ), iter: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..208, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..203, id: Name("x"), ctx: Load, @@ -551,7 +551,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..208, id: Name("a"), ctx: Load, @@ -570,15 +570,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 210..227, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 210..227, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..212, id: Name("a"), ctx: Load, @@ -587,15 +587,15 @@ Module( generators: [ Comprehension { range: 213..226, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..221, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..218, id: Name("a"), ctx: Store, @@ -603,7 +603,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..221, id: Name("b"), ctx: Store, @@ -616,7 +616,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..226, id: Name("G"), ctx: Load, @@ -632,19 +632,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..257, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..257, elt: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..241, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..241, id: Name("x"), ctx: Load, @@ -655,15 +655,15 @@ Module( generators: [ Comprehension { range: 242..255, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..250, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..247, id: Name("a"), ctx: Store, @@ -671,7 +671,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 249..250, id: Name("b"), ctx: Store, @@ -684,7 +684,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..255, id: Name("C"), ctx: Load, @@ -700,15 +700,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..300, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..300, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..260, id: Name("i"), ctx: Load, @@ -717,10 +717,10 @@ Module( generators: [ Comprehension { range: 261..299, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..266, id: Name("i"), ctx: Store, @@ -728,11 +728,11 @@ Module( ), iter: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 270..277, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 276..277, id: Name("x"), ctx: Load, @@ -743,11 +743,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..299, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..287, id: Name("entity"), ctx: Load, @@ -759,7 +759,7 @@ Module( comparators: [ NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 295..299, }, ), @@ -776,15 +776,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..337, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..337, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 302..303, id: Name("x"), ctx: Load, @@ -793,10 +793,10 @@ Module( generators: [ Comprehension { range: 304..336, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 308..309, id: Name("x"), ctx: Store, @@ -804,18 +804,18 @@ Module( ), iter: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 314..330, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..323, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 314..315, id: Name("l"), ctx: Load, @@ -823,7 +823,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 329..330, id: Name("L"), ctx: Load, @@ -834,7 +834,7 @@ Module( ifs: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..336, id: Name("T"), ctx: Load, @@ -850,15 +850,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 338..380, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 338..380, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 339..340, id: Name("i"), ctx: Load, @@ -867,10 +867,10 @@ Module( generators: [ Comprehension { range: 341..379, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 345..346, id: Name("i"), ctx: Store, @@ -878,22 +878,22 @@ Module( ), iter: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..373, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 362..366, value: true, }, ), body: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..358, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 357..358, id: Name("x"), ctx: Load, @@ -903,7 +903,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 372..373, id: Name("X"), ctx: Load, @@ -914,7 +914,7 @@ Module( ifs: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 378..379, id: Name("F"), ctx: Load, @@ -930,15 +930,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 381..423, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 381..423, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 382..383, id: Name("i"), ctx: Load, @@ -947,10 +947,10 @@ Module( generators: [ Comprehension { range: 384..422, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 388..389, id: Name("i"), ctx: Store, @@ -958,22 +958,22 @@ Module( ), iter: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 393..417, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 400..416, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 405..409, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 400..401, id: Name("x"), ctx: Load, @@ -981,7 +981,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 415..416, id: Name("X"), ctx: Load, @@ -994,7 +994,7 @@ Module( ifs: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..422, id: Name("F"), ctx: Load, @@ -1010,15 +1010,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 424..457, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 424..457, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 425..426, id: Name("f"), ctx: Load, @@ -1027,10 +1027,10 @@ Module( generators: [ Comprehension { range: 427..456, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 431..432, id: Name("f"), ctx: Store, @@ -1038,11 +1038,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 436..456, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 436..437, id: Name("c"), ctx: Load, @@ -1050,22 +1050,22 @@ Module( ), arguments: Arguments { range: 437..456, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 438..455, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 443..447, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 438..439, id: Name("x"), ctx: Load, @@ -1073,7 +1073,7 @@ Module( ), orelse: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 453..455, elts: [], ctx: Load, @@ -1096,15 +1096,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 596..618, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 596..618, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 597..598, id: Name("x"), ctx: Load, @@ -1113,10 +1113,10 @@ Module( generators: [ Comprehension { range: 599..617, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 603..604, id: Name("x"), ctx: Store, @@ -1124,12 +1124,12 @@ Module( ), iter: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 609..616, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 615..616, id: Name("y"), ctx: Load, @@ -1148,15 +1148,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 619..646, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 619..646, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 620..621, id: Name("x"), ctx: Load, @@ -1165,10 +1165,10 @@ Module( generators: [ Comprehension { range: 622..645, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 626..627, id: Name("x"), ctx: Store, @@ -1176,11 +1176,11 @@ Module( ), iter: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 632..644, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 643..644, id: Name("y"), ctx: Load, @@ -1198,15 +1198,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 647..673, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 647..673, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 648..649, id: Name("x"), ctx: Load, @@ -1215,10 +1215,10 @@ Module( generators: [ Comprehension { range: 650..672, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 654..655, id: Name("x"), ctx: Store, @@ -1226,26 +1226,24 @@ Module( ), iter: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 660..671, parameters: Some( Parameters { range: 667..668, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 667..668, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 667..668, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 667..668, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1259,7 +1257,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 670..671, id: Name("y"), ctx: Load, @@ -1277,15 +1275,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 674..704, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 674..704, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 675..676, id: Name("x"), ctx: Load, @@ -1294,10 +1292,10 @@ Module( generators: [ Comprehension { range: 677..703, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 681..682, id: Name("x"), ctx: Store, @@ -1305,7 +1303,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 686..690, id: Name("data"), ctx: Load, @@ -1314,12 +1312,12 @@ Module( ifs: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 695..702, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 701..702, id: Name("y"), ctx: Load, @@ -1338,15 +1336,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 705..740, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 705..740, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 706..707, id: Name("x"), ctx: Load, @@ -1355,10 +1353,10 @@ Module( generators: [ Comprehension { range: 708..739, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 712..713, id: Name("x"), ctx: Store, @@ -1366,7 +1364,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 717..721, id: Name("data"), ctx: Load, @@ -1375,11 +1373,11 @@ Module( ifs: [ YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 726..738, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 737..738, id: Name("y"), ctx: Load, @@ -1397,15 +1395,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 741..775, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 741..775, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 742..743, id: Name("x"), ctx: Load, @@ -1414,10 +1412,10 @@ Module( generators: [ Comprehension { range: 744..774, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 748..749, id: Name("x"), ctx: Store, @@ -1425,7 +1423,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 753..757, id: Name("data"), ctx: Load, @@ -1434,26 +1432,24 @@ Module( ifs: [ Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 762..773, parameters: Some( Parameters { range: 769..770, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 769..770, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 769..770, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 769..770, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1467,7 +1463,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 772..773, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap index 506ee52722..b32e08dff6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/name.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..76, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("_"), ctx: Load, @@ -26,11 +26,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..5, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, id: Name("_"), ctx: Load, @@ -40,11 +40,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..8, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..8, id: Name("__"), ctx: Load, @@ -54,11 +54,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..17, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..17, id: Name("__init__"), ctx: Load, @@ -68,11 +68,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..22, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..22, id: Name("name"), ctx: Load, @@ -82,11 +82,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..29, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..28, id: Name("name"), ctx: Load, @@ -96,11 +96,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..65, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..65, id: Name("match"), ctx: Load, @@ -110,11 +110,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..70, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..70, id: Name("case"), ctx: Load, @@ -124,11 +124,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..75, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..75, id: Name("type"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap index 1ac703b53b..199a11eab6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/named.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..157, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..10, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..5, id: Name("name"), ctx: Store, @@ -28,7 +28,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 0, @@ -41,15 +41,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..29, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..28, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..17, id: Name("name"), ctx: Store, @@ -57,11 +57,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..27, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("x"), ctx: Load, @@ -70,7 +70,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("y"), ctx: Load, @@ -84,15 +84,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..45, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..44, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..35, id: Name("name"), ctx: Store, @@ -100,11 +100,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..44, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, value: Int( 1, @@ -114,7 +114,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, value: Int( 1, @@ -129,15 +129,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..63, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..62, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..51, id: Name("name"), ctx: Store, @@ -145,16 +145,16 @@ Module( ), value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..62, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..58, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, id: Name("x"), ctx: Load, @@ -165,7 +165,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("y"), ctx: Load, @@ -182,15 +182,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..90, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..89, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..69, id: Name("name"), ctx: Store, @@ -198,18 +198,18 @@ Module( ), value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..89, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..82, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..74, id: Name("x"), ctx: Load, @@ -217,7 +217,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, id: Name("y"), ctx: Load, @@ -231,15 +231,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..112, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..111, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..96, id: Name("name"), ctx: Store, @@ -247,26 +247,24 @@ Module( ), value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..111, parameters: Some( Parameters { range: 107..108, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 107..108, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 107..108, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 107..108, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -280,7 +278,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..111, id: Name("x"), ctx: Load, @@ -294,15 +292,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..132, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..131, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..118, id: Name("name"), ctx: Store, @@ -310,12 +308,12 @@ Module( ), value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..130, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, id: Name("x"), ctx: Load, @@ -330,15 +328,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..157, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..156, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..138, id: Name("name"), ctx: Store, @@ -346,11 +344,11 @@ Module( ), value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..155, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..155, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap index 46dac564f0..ad313fbab1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/number_literal ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..700, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -26,7 +26,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..13, value: Int( 123456789, @@ -37,12 +37,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..24, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("x"), ctx: Store, @@ -51,7 +51,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..24, value: Int( 123456, @@ -62,12 +62,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..31, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, id: Name("x"), ctx: Store, @@ -76,7 +76,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..31, value: Float( 0.1, @@ -87,12 +87,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..38, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, id: Name("x"), ctx: Store, @@ -101,7 +101,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..38, value: Float( 1.0, @@ -112,12 +112,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..47, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("x"), ctx: Store, @@ -126,7 +126,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..47, value: Float( 10.0, @@ -137,12 +137,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..56, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..49, id: Name("x"), ctx: Store, @@ -151,7 +151,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..56, value: Float( 0.1, @@ -162,12 +162,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..73, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, id: Name("x"), ctx: Store, @@ -176,7 +176,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..73, value: Float( 1.00000001, @@ -187,12 +187,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..97, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, id: Name("x"), ctx: Store, @@ -201,7 +201,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..97, value: Float( 123456789.12345679, @@ -212,12 +212,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..131, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, id: Name("x"), ctx: Store, @@ -226,7 +226,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..131, value: Float( inf, @@ -237,12 +237,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..155, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, id: Name("x"), ctx: Store, @@ -251,7 +251,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..155, value: Float( inf, @@ -262,12 +262,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..170, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..157, id: Name("x"), ctx: Store, @@ -276,7 +276,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..170, value: Complex { real: 0.0, @@ -288,12 +288,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..195, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..172, id: Name("x"), ctx: Store, @@ -302,7 +302,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..195, value: Complex { real: 0.0, @@ -314,12 +314,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..207, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..197, id: Name("x"), ctx: Store, @@ -328,7 +328,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..207, value: Int( 727756, @@ -339,12 +339,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..218, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..209, id: Name("x"), ctx: Store, @@ -353,7 +353,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 212..218, value: Int( 11, @@ -364,12 +364,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..228, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..220, id: Name("x"), ctx: Store, @@ -378,7 +378,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..228, value: Int( 511, @@ -389,12 +389,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 229..244, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 229..230, id: Name("x"), ctx: Store, @@ -403,7 +403,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..244, value: Float( 6e-9, @@ -414,12 +414,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..254, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..246, id: Name("x"), ctx: Store, @@ -428,7 +428,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 249..254, value: Int( 10000, @@ -439,12 +439,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..265, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..256, id: Name("x"), ctx: Store, @@ -453,7 +453,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..265, value: Int( 133333, @@ -464,12 +464,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..298, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..287, id: Name("x"), ctx: Store, @@ -478,11 +478,11 @@ Module( ], value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..298, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..292, value: Float( 1.0, @@ -492,7 +492,7 @@ Module( attr: Identifier { id: Name("imag"), range: 294..298, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -501,12 +501,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 299..312, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 299..300, id: Name("x"), ctx: Store, @@ -515,11 +515,11 @@ Module( ], value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 303..312, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 303..307, value: Float( 10.0, @@ -529,7 +529,7 @@ Module( attr: Identifier { id: Name("imag"), range: 308..312, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -538,12 +538,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..326, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..314, id: Name("x"), ctx: Store, @@ -552,11 +552,11 @@ Module( ], value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..326, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..321, value: Float( 0.1, @@ -566,7 +566,7 @@ Module( attr: Identifier { id: Name("real"), range: 322..326, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -575,12 +575,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..356, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..328, id: Name("x"), ctx: Store, @@ -589,15 +589,15 @@ Module( ], value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..356, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..354, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..350, value: Float( 123456789.12345679, @@ -607,14 +607,14 @@ Module( attr: Identifier { id: Name("hex"), range: 351..354, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 354..356, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -624,12 +624,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 357..396, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 357..358, id: Name("x"), ctx: Store, @@ -638,11 +638,11 @@ Module( ], value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 361..396, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 361..390, value: Float( inf, @@ -652,7 +652,7 @@ Module( attr: Identifier { id: Name("real"), range: 392..396, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -661,12 +661,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 397..433, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 397..398, id: Name("x"), ctx: Store, @@ -675,15 +675,15 @@ Module( ], value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 401..433, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 401..431, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 401..420, value: Float( inf, @@ -693,14 +693,14 @@ Module( attr: Identifier { id: Name("conjugate"), range: 422..431, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 431..433, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -710,12 +710,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 434..453, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 434..435, id: Name("x"), ctx: Store, @@ -724,11 +724,11 @@ Module( ], value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 438..453, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 438..448, value: Complex { real: 0.0, @@ -739,7 +739,7 @@ Module( attr: Identifier { id: Name("real"), range: 449..453, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -748,12 +748,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 454..507, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 454..455, id: Name("x"), ctx: Store, @@ -762,15 +762,15 @@ Module( ], value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 458..507, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 458..486, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 458..478, value: Complex { real: 0.0, @@ -781,26 +781,26 @@ Module( attr: Identifier { id: Name("__add__"), range: 479..486, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 486..507, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 487..506, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 487..504, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 487..493, value: Int( 11, @@ -810,14 +810,14 @@ Module( attr: Identifier { id: Name("bit_length"), range: 494..504, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 504..506, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -832,12 +832,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 508..531, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 508..509, id: Name("x"), ctx: Store, @@ -846,15 +846,15 @@ Module( ], value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 512..531, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 512..529, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 512..519, value: Int( 727756, @@ -864,14 +864,14 @@ Module( attr: Identifier { id: Name("conjugate"), range: 520..529, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 529..531, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -881,12 +881,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 532..555, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 532..533, id: Name("x"), ctx: Store, @@ -895,15 +895,15 @@ Module( ], value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 536..555, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 536..553, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 536..542, value: Int( 11, @@ -913,14 +913,14 @@ Module( attr: Identifier { id: Name("conjugate"), range: 544..553, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 553..555, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -930,12 +930,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 556..571, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 556..557, id: Name("x"), ctx: Store, @@ -944,11 +944,11 @@ Module( ], value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 560..571, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 560..565, value: Int( 511, @@ -958,7 +958,7 @@ Module( attr: Identifier { id: Name("real"), range: 567..571, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -967,12 +967,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 572..595, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 572..573, id: Name("x"), ctx: Store, @@ -981,15 +981,15 @@ Module( ], value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 576..595, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 576..593, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 576..587, value: Float( 6e-9, @@ -999,14 +999,14 @@ Module( attr: Identifier { id: Name("hex"), range: 590..593, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 593..595, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1016,12 +1016,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 596..610, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 596..597, id: Name("x"), ctx: Store, @@ -1030,12 +1030,12 @@ Module( ], value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 600..610, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 601..610, value: Complex { real: 0.0, @@ -1049,15 +1049,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 612..632, test: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 615..623, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 615..617, value: Int( 10, @@ -1067,7 +1067,7 @@ Module( attr: Identifier { id: Name("real"), range: 619..623, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -1075,11 +1075,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 629..632, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 629..632, }, ), @@ -1091,12 +1091,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 677..688, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 677..678, id: Name("y"), ctx: Store, @@ -1105,11 +1105,11 @@ Module( ], value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 681..688, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 681..684, value: Int( 100, @@ -1118,7 +1118,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 685..687, id: Name("no"), ctx: Load, @@ -1131,12 +1131,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 689..700, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 689..690, id: Name("y"), ctx: Store, @@ -1145,11 +1145,11 @@ Module( ], value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 693..700, func: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 693..696, value: Int( 100, @@ -1158,11 +1158,11 @@ Module( ), arguments: Arguments { range: 696..700, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 697..699, id: Name("no"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap index 747ed8ee3d..9854d74ac1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/parenthesized. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..92, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..5, id: Name("expr"), ctx: Load, @@ -26,15 +26,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..15, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..15, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..12, id: Name("expr"), ctx: Load, @@ -42,7 +42,7 @@ Module( ), arguments: Arguments { range: 13..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -52,23 +52,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..28, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..28, func: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..26, func: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..24, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..21, id: Name("expr"), ctx: Load, @@ -76,7 +76,7 @@ Module( ), arguments: Arguments { range: 22..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -84,7 +84,7 @@ Module( ), arguments: Arguments { range: 24..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -92,7 +92,7 @@ Module( ), arguments: Arguments { range: 26..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -102,23 +102,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..44, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..43, op: Or, values: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..38, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..32, id: Name("a"), ctx: Load, @@ -126,7 +126,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, id: Name("b"), ctx: Load, @@ -137,7 +137,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, id: Name("c"), ctx: Load, @@ -150,30 +150,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..58, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..57, parameters: Some( Parameters { range: 53..54, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -187,7 +185,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("x"), ctx: Load, @@ -199,15 +197,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..67, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..66, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("x"), ctx: Store, @@ -215,7 +213,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, value: Int( 2, @@ -228,16 +226,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..77, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..76, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, id: Name("x"), ctx: Load, @@ -250,15 +248,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..92, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..91, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap index eb99b5e4d0..e65e97a2b8 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/set.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..313, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..16, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..16, items: [], }, @@ -25,16 +25,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..20, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, value: Int( 1, @@ -48,16 +48,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..25, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..25, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, value: Int( 1, @@ -71,16 +71,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..35, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..35, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, value: Int( 1, @@ -89,7 +89,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..31, value: Int( 2, @@ -98,7 +98,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..34, value: Int( 3, @@ -112,16 +112,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..46, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..46, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, value: Int( 1, @@ -130,7 +130,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, value: Int( 2, @@ -139,7 +139,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, value: Int( 3, @@ -153,11 +153,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..77, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..77, items: [], }, @@ -166,16 +166,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..91, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..91, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, value: Int( 1, @@ -189,16 +189,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..113, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..113, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, value: Int( 1, @@ -207,7 +207,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..110, value: Int( 2, @@ -221,21 +221,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..129, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..129, elts: [ Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..128, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..127, value: Int( 1, @@ -252,21 +252,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..146, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..146, elts: [ Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..137, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, value: Int( 1, @@ -275,7 +275,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, value: Int( 2, @@ -287,12 +287,12 @@ Module( ), Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..145, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..141, value: Int( 3, @@ -301,7 +301,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..144, value: Int( 4, @@ -318,20 +318,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..175, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..175, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..174, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..169, id: Name("x"), ctx: Store, @@ -339,7 +339,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 173..174, value: Int( 2, @@ -355,16 +355,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..190, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..190, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..178, value: Int( 1, @@ -373,11 +373,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 180..186, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 180..181, id: Name("x"), ctx: Store, @@ -385,7 +385,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..186, value: Int( 2, @@ -396,7 +396,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..189, value: Int( 3, @@ -410,16 +410,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..205, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..205, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..193, value: Int( 1, @@ -428,11 +428,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..202, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..197, id: Name("x"), ctx: Store, @@ -440,7 +440,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..202, value: Int( 2, @@ -456,16 +456,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..235, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..235, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..227, value: Int( 1, @@ -474,11 +474,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 229..231, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..231, id: Name("x"), ctx: Load, @@ -489,7 +489,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..234, value: Int( 3, @@ -503,16 +503,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..250, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..250, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 237..238, value: Int( 1, @@ -521,15 +521,15 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..246, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..246, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..242, id: Name("x"), ctx: Load, @@ -538,7 +538,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..246, id: Name("y"), ctx: Load, @@ -551,7 +551,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 248..249, value: Int( 3, @@ -565,20 +565,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 273..312, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 273..312, elts: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..279, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..275, value: Int( 1, @@ -588,7 +588,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 278..279, value: Int( 2, @@ -599,12 +599,12 @@ Module( ), Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..287, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..283, id: Name("a"), ctx: Load, @@ -612,7 +612,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 285..286, id: Name("b"), ctx: Load, @@ -625,12 +625,12 @@ Module( ), Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 289..298, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..291, value: Int( 1, @@ -639,7 +639,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 293..294, value: Int( 2, @@ -648,7 +648,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 296..297, value: Int( 3, @@ -660,14 +660,14 @@ Module( ), Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..311, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..302, id: Name("a"), ctx: Load, @@ -676,7 +676,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 304..305, id: Name("b"), ctx: Load, @@ -687,7 +687,7 @@ Module( key: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 309..310, id: Name("d"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap index 8ead74d20d..5482a567fc 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/set_comprehens ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..492, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, id: Name("x"), ctx: Load, @@ -29,10 +29,10 @@ Module( generators: [ Comprehension { range: 3..14, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("i"), ctx: Store, @@ -40,7 +40,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..14, id: Name("ll"), ctx: Load, @@ -56,15 +56,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..57, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..57, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("b"), ctx: Load, @@ -73,10 +73,10 @@ Module( generators: [ Comprehension { range: 19..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("c"), ctx: Store, @@ -84,7 +84,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, id: Name("d"), ctx: Load, @@ -93,11 +93,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..39, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..34, id: Name("x"), ctx: Load, @@ -109,7 +109,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("w"), ctx: Load, @@ -120,13 +120,13 @@ Module( ), BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..51, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, id: Name("y"), ctx: Load, @@ -134,7 +134,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..51, id: Name("yy"), ctx: Load, @@ -145,7 +145,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, id: Name("z"), ctx: Load, @@ -161,15 +161,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..103, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..103, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, id: Name("a"), ctx: Load, @@ -178,10 +178,10 @@ Module( generators: [ Comprehension { range: 61..82, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, id: Name("b"), ctx: Store, @@ -189,7 +189,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, id: Name("c"), ctx: Load, @@ -198,13 +198,13 @@ Module( ifs: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..82, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, id: Name("d"), ctx: Load, @@ -212,7 +212,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, id: Name("e"), ctx: Load, @@ -226,10 +226,10 @@ Module( }, Comprehension { range: 83..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..88, id: Name("f"), ctx: Store, @@ -237,7 +237,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..93, id: Name("j"), ctx: Load, @@ -246,11 +246,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..102, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, id: Name("k"), ctx: Load, @@ -262,7 +262,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..102, id: Name("h"), ctx: Load, @@ -281,15 +281,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..155, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..155, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, id: Name("a"), ctx: Load, @@ -298,10 +298,10 @@ Module( generators: [ Comprehension { range: 107..128, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..112, id: Name("b"), ctx: Store, @@ -309,7 +309,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..117, id: Name("c"), ctx: Load, @@ -318,13 +318,13 @@ Module( ifs: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..128, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..122, id: Name("d"), ctx: Load, @@ -332,7 +332,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("e"), ctx: Load, @@ -346,10 +346,10 @@ Module( }, Comprehension { range: 129..154, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..140, id: Name("f"), ctx: Store, @@ -357,7 +357,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..145, id: Name("j"), ctx: Load, @@ -366,11 +366,11 @@ Module( ifs: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..154, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..150, id: Name("k"), ctx: Load, @@ -382,7 +382,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..154, id: Name("h"), ctx: Load, @@ -401,15 +401,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..173, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..173, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..158, id: Name("a"), ctx: Load, @@ -418,15 +418,15 @@ Module( generators: [ Comprehension { range: 159..172, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..167, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..164, id: Name("a"), ctx: Store, @@ -434,7 +434,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..167, id: Name("b"), ctx: Store, @@ -447,7 +447,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..172, id: Name("G"), ctx: Load, @@ -463,15 +463,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..334, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..334, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..314, id: Name("x"), ctx: Load, @@ -480,10 +480,10 @@ Module( generators: [ Comprehension { range: 315..333, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..320, id: Name("x"), ctx: Store, @@ -491,12 +491,12 @@ Module( ), iter: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 325..332, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..332, id: Name("y"), ctx: Load, @@ -515,15 +515,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..362, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..362, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..337, id: Name("x"), ctx: Load, @@ -532,10 +532,10 @@ Module( generators: [ Comprehension { range: 338..361, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 342..343, id: Name("x"), ctx: Store, @@ -543,11 +543,11 @@ Module( ), iter: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..360, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 359..360, id: Name("y"), ctx: Load, @@ -565,15 +565,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 363..389, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 363..389, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..365, id: Name("x"), ctx: Load, @@ -582,10 +582,10 @@ Module( generators: [ Comprehension { range: 366..388, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 370..371, id: Name("x"), ctx: Store, @@ -593,26 +593,24 @@ Module( ), iter: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 376..387, parameters: Some( Parameters { range: 383..384, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 383..384, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 383..384, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 383..384, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -626,7 +624,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 386..387, id: Name("y"), ctx: Load, @@ -644,15 +642,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 390..420, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 390..420, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 391..392, id: Name("x"), ctx: Load, @@ -661,10 +659,10 @@ Module( generators: [ Comprehension { range: 393..419, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 397..398, id: Name("x"), ctx: Store, @@ -672,7 +670,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 402..406, id: Name("data"), ctx: Load, @@ -681,12 +679,12 @@ Module( ifs: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 411..418, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 417..418, id: Name("y"), ctx: Load, @@ -705,15 +703,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..456, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..456, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 422..423, id: Name("x"), ctx: Load, @@ -722,10 +720,10 @@ Module( generators: [ Comprehension { range: 424..455, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 428..429, id: Name("x"), ctx: Store, @@ -733,7 +731,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 433..437, id: Name("data"), ctx: Load, @@ -742,11 +740,11 @@ Module( ifs: [ YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 442..454, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 453..454, id: Name("y"), ctx: Load, @@ -764,15 +762,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 457..491, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 457..491, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 458..459, id: Name("x"), ctx: Load, @@ -781,10 +779,10 @@ Module( generators: [ Comprehension { range: 460..490, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 464..465, id: Name("x"), ctx: Store, @@ -792,7 +790,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 469..473, id: Name("data"), ctx: Load, @@ -801,26 +799,24 @@ Module( ifs: [ Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 478..489, parameters: Some( Parameters { range: 485..486, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 485..486, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 485..486, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 485..486, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -834,7 +830,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 488..489, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap index c04177fae7..d19e76dab3 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/slice.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..211, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..27, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..27, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("x"), ctx: Load, @@ -28,7 +28,7 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, lower: None, upper: None, @@ -42,15 +42,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..33, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..33, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, id: Name("x"), ctx: Load, @@ -58,12 +58,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..32, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..31, value: Int( 1, @@ -82,15 +82,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..39, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..39, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("x"), ctx: Load, @@ -98,13 +98,13 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..38, lower: None, upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, value: Int( 2, @@ -122,15 +122,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..46, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..46, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("x"), ctx: Load, @@ -138,12 +138,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..45, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, value: Int( 1, @@ -154,7 +154,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, value: Int( 2, @@ -172,15 +172,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..52, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..52, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Load, @@ -188,7 +188,7 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..51, lower: None, upper: None, @@ -202,15 +202,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..59, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..59, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, id: Name("x"), ctx: Load, @@ -218,12 +218,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..58, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, value: Int( 1, @@ -242,15 +242,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..66, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..66, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("x"), ctx: Load, @@ -258,13 +258,13 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..65, lower: None, upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, value: Int( 2, @@ -282,15 +282,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..74, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..74, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..68, id: Name("x"), ctx: Load, @@ -298,12 +298,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..73, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..70, value: Int( 1, @@ -314,7 +314,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, value: Int( 2, @@ -332,15 +332,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..81, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..81, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, id: Name("x"), ctx: Load, @@ -348,14 +348,14 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..80, lower: None, upper: None, step: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, value: Int( 3, @@ -372,15 +372,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..89, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..89, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, id: Name("x"), ctx: Load, @@ -388,12 +388,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..88, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..85, value: Int( 1, @@ -405,7 +405,7 @@ Module( step: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..88, value: Int( 3, @@ -422,15 +422,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..97, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..97, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("x"), ctx: Load, @@ -438,13 +438,13 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..96, lower: None, upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, value: Int( 2, @@ -455,7 +455,7 @@ Module( step: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..96, value: Int( 3, @@ -472,15 +472,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..106, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..106, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, id: Name("x"), ctx: Load, @@ -488,12 +488,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..105, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, value: Int( 1, @@ -504,7 +504,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, value: Int( 2, @@ -515,7 +515,7 @@ Module( step: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, value: Int( 3, @@ -532,15 +532,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..136, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..136, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("x"), ctx: Load, @@ -548,11 +548,11 @@ Module( ), slice: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..135, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, id: Name("y"), ctx: Store, @@ -560,7 +560,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..135, value: Int( 2, @@ -576,15 +576,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..149, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..149, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..138, id: Name("x"), ctx: Load, @@ -592,16 +592,16 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..148, lower: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..146, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..141, id: Name("y"), ctx: Store, @@ -609,7 +609,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..146, value: Int( 2, @@ -630,15 +630,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..160, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..160, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..151, id: Name("x"), ctx: Load, @@ -646,16 +646,16 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..159, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..158, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..153, id: Name("y"), ctx: Store, @@ -663,7 +663,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..158, value: Int( 2, @@ -684,15 +684,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..210, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..210, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..203, id: Name("x"), ctx: Load, @@ -700,12 +700,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..209, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..205, value: Int( 1, @@ -714,13 +714,13 @@ Module( ), Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..208, lower: None, upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..208, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap index a4fe4f78b4..be5cfdc577 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/starred.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..172, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..2, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..2, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, id: Name("a"), ctx: Load, @@ -33,19 +33,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..11, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..11, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("a"), ctx: Load, @@ -54,7 +54,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 1, @@ -70,19 +70,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..19, value: Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..19, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..19, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, id: Name("x"), ctx: Load, @@ -91,7 +91,7 @@ Module( attr: Identifier { id: Name("attr"), range: 15..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -103,12 +103,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..57, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..32, id: Name("array_slice"), ctx: Store, @@ -117,11 +117,11 @@ Module( ], value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..57, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..40, id: Name("array"), ctx: Load, @@ -129,12 +129,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..56, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, value: Int( 0, @@ -143,11 +143,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..52, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..52, id: Name("indexes"), ctx: Load, @@ -158,12 +158,12 @@ Module( ), UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..56, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, value: Int( 1, @@ -184,16 +184,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..94, targets: [ Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..80, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..63, id: Name("array"), ctx: Load, @@ -201,12 +201,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..79, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..65, value: Int( 0, @@ -215,11 +215,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..75, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..75, id: Name("indexes"), ctx: Load, @@ -230,12 +230,12 @@ Module( ), UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..79, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, value: Int( 1, @@ -255,7 +255,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..94, id: Name("array_slice"), ctx: Load, @@ -265,15 +265,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..140, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..140, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..100, id: Name("array"), ctx: Load, @@ -281,16 +281,16 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..139, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..119, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..119, id: Name("indexes_to_select"), ctx: Load, @@ -301,11 +301,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..139, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..139, id: Name("indexes_to_select"), ctx: Load, @@ -326,15 +326,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..171, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..171, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..146, id: Name("array"), ctx: Load, @@ -342,17 +342,17 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..170, elts: [ Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..150, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..148, value: Int( 3, @@ -363,7 +363,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..150, value: Int( 5, @@ -376,11 +376,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..170, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..170, id: Name("indexes_to_select"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap index f9480bed42..e03b149d1a 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/string.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..163, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, value: StringLiteralValue { inner: Single( StringLiteral { range: 0..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello World", flags: StringLiteralFlags { quote_style: Single, @@ -38,17 +38,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..20, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..20, value: StringLiteralValue { inner: Single( StringLiteral { range: 14..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "😎", flags: StringLiteralFlags { quote_style: Double, @@ -64,11 +64,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..32, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..32, value: StringLiteralValue { inner: Concatenated( @@ -76,7 +76,7 @@ Module( strings: [ StringLiteral { range: 21..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Foo", flags: StringLiteralFlags { quote_style: Single, @@ -86,7 +86,7 @@ Module( }, StringLiteral { range: 27..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Bar", flags: StringLiteralFlags { quote_style: Single, @@ -105,11 +105,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..60, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..58, value: StringLiteralValue { inner: Concatenated( @@ -117,7 +117,7 @@ Module( strings: [ StringLiteral { range: 39..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "A", flags: StringLiteralFlags { quote_style: Single, @@ -127,7 +127,7 @@ Module( }, StringLiteral { range: 47..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "B", flags: StringLiteralFlags { quote_style: Single, @@ -137,7 +137,7 @@ Module( }, StringLiteral { range: 55..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "C", flags: StringLiteralFlags { quote_style: Single, @@ -156,17 +156,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..79, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..79, value: StringLiteralValue { inner: Single( StringLiteral { range: 61..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Olá, Mundo!", flags: StringLiteralFlags { quote_style: Single, @@ -182,17 +182,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..91, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..91, value: StringLiteralValue { inner: Single( StringLiteral { range: 80..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "ABCDE", flags: StringLiteralFlags { quote_style: Double, @@ -208,11 +208,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..121, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..119, value: StringLiteralValue { inner: Concatenated( @@ -220,7 +220,7 @@ Module( strings: [ StringLiteral { range: 98..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "aB", flags: StringLiteralFlags { quote_style: Single, @@ -230,7 +230,7 @@ Module( }, StringLiteral { range: 111..119, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "cD", flags: StringLiteralFlags { quote_style: Single, @@ -249,17 +249,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..136, value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..136, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 122..136, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 104, 101, @@ -287,18 +287,18 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..161, value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..161, value: BytesLiteralValue { inner: Concatenated( [ BytesLiteral { range: 137..145, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 98, 121, @@ -314,7 +314,7 @@ Module( }, BytesLiteral { range: 146..161, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [ 99, 111, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap index f90b4a3033..8407b7a8d8 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/subscript.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..266, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..7, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..4, id: Name("data"), ctx: Load, @@ -32,7 +32,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, value: Int( 0, @@ -44,7 +44,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, value: Int( 0, @@ -58,15 +58,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..21, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..21, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..15, id: Name("data"), ctx: Load, @@ -74,12 +74,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..20, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, value: Int( 0, @@ -88,7 +88,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, value: Int( 1, @@ -107,15 +107,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..31, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..31, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..26, id: Name("data"), ctx: Load, @@ -123,17 +123,17 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..30, elts: [ Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..29, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, value: Int( 0, @@ -157,15 +157,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..43, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..43, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..36, id: Name("data"), ctx: Load, @@ -173,17 +173,17 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..42, elts: [ Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..39, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, value: Int( 0, @@ -197,7 +197,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, value: Int( 1, @@ -216,15 +216,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..56, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..56, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..48, id: Name("data"), ctx: Load, @@ -232,17 +232,17 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..55, elts: [ Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, value: Int( 0, @@ -253,7 +253,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 1, @@ -266,7 +266,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 2, @@ -285,15 +285,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..80, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..80, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..61, id: Name("data"), ctx: Load, @@ -301,17 +301,17 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..79, elts: [ Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..67, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, value: Int( 0, @@ -322,7 +322,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..65, value: Int( 1, @@ -333,7 +333,7 @@ Module( step: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, value: Int( 2, @@ -345,7 +345,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..70, value: Int( 3, @@ -354,12 +354,12 @@ Module( ), Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..79, lower: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("a"), ctx: Load, @@ -369,11 +369,11 @@ Module( upper: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..79, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, id: Name("b"), ctx: Load, @@ -382,7 +382,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, value: Int( 1, @@ -407,15 +407,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..93, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..93, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..85, id: Name("data"), ctx: Load, @@ -423,11 +423,11 @@ Module( ), slice: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..92, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..87, id: Name("a"), ctx: Store, @@ -435,7 +435,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..92, id: Name("b"), ctx: Load, @@ -450,15 +450,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..106, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..106, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..98, id: Name("data"), ctx: Load, @@ -466,12 +466,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..105, elts: [ Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, lower: None, upper: None, @@ -480,13 +480,13 @@ Module( ), Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..105, lower: None, upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..105, value: Int( 11, @@ -509,15 +509,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..120, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..120, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..111, id: Name("data"), ctx: Load, @@ -525,12 +525,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..119, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..113, value: Int( 1, @@ -539,7 +539,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..116, value: Int( 2, @@ -548,7 +548,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..119, value: Int( 3, @@ -567,15 +567,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..132, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..132, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..125, id: Name("data"), ctx: Load, @@ -583,12 +583,12 @@ Module( ), slice: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..131, op: Invert, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..131, id: Name("flag"), ctx: Load, @@ -603,15 +603,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..148, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..148, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..137, id: Name("data"), ctx: Load, @@ -619,16 +619,16 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 138..147, lower: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..145, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..140, id: Name("a"), ctx: Store, @@ -636,7 +636,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..145, value: Int( 0, @@ -657,15 +657,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..165, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..165, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..153, id: Name("data"), ctx: Load, @@ -673,16 +673,16 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..164, lower: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..161, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..156, id: Name("a"), ctx: Store, @@ -690,7 +690,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..161, value: Int( 0, @@ -703,7 +703,7 @@ Module( upper: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..164, id: Name("y"), ctx: Load, @@ -720,15 +720,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..234, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..234, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..230, id: Name("data"), ctx: Load, @@ -736,16 +736,16 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..233, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..233, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..233, id: Name("x"), ctx: Load, @@ -766,15 +766,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..249, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..249, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..239, id: Name("data"), ctx: Load, @@ -782,22 +782,22 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..248, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..248, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..248, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..242, id: Name("x"), ctx: Load, @@ -805,7 +805,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 247..248, id: Name("y"), ctx: Load, @@ -829,15 +829,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..265, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..265, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..254, id: Name("data"), ctx: Load, @@ -845,20 +845,20 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..264, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..264, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 257..263, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 257..258, id: Name("x"), ctx: Store, @@ -866,7 +866,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 262..263, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap index c2ee44b3be..2233e19dc5 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/t_string.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..864, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..21, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..21, value: TStringValue { inner: Single( TString { range: 18..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: TStringFlags { quote_style: Double, @@ -38,17 +38,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, value: TStringValue { inner: Single( TString { range: 22..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: TStringFlags { quote_style: Double, @@ -64,17 +64,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, value: TStringValue { inner: Single( TString { range: 26..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: TStringFlags { quote_style: Single, @@ -90,17 +90,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..37, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..37, value: TStringValue { inner: Single( TString { range: 30..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: TStringFlags { quote_style: Double, @@ -116,17 +116,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..45, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..45, value: TStringValue { inner: Single( TString { range: 38..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], flags: TStringFlags { quote_style: Single, @@ -142,31 +142,31 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..56, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..56, value: TStringValue { inner: Single( TString { range: 47..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 49..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..54, value: StringLiteralValue { inner: Single( StringLiteral { range: 50..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " t", flags: StringLiteralFlags { quote_style: Double, @@ -198,25 +198,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..67, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..67, value: TStringValue { inner: Single( TString { range: 57..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 59..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, id: Name("foo"), ctx: Load, @@ -242,30 +242,30 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..75, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..75, value: TStringValue { inner: Single( TString { range: 68..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 70..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..73, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, value: Int( 3, @@ -297,29 +297,29 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..86, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..86, value: TStringValue { inner: Single( TString { range: 76..86, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 78..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..83, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, value: Int( 3, @@ -332,7 +332,7 @@ Module( comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, value: Int( 4, @@ -347,7 +347,7 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 84..84, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], }, ), @@ -368,25 +368,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..102, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..102, value: TStringValue { inner: Single( TString { range: 87..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 89..101, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, value: Int( 3, @@ -398,21 +398,21 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 92..100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 92..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..96, value: StringLiteralValue { inner: Single( StringLiteral { range: 93..96, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "}", flags: StringLiteralFlags { quote_style: Double, @@ -432,7 +432,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 97..100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ">10", }, ), @@ -456,25 +456,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..118, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..118, value: TStringValue { inner: Single( TString { range: 103..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 105..117, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..107, value: Int( 3, @@ -486,21 +486,21 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 108..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 108..113, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, value: StringLiteralValue { inner: Single( StringLiteral { range: 109..112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "{", flags: StringLiteralFlags { quote_style: Double, @@ -520,7 +520,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 113..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ">10", }, ), @@ -544,25 +544,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..133, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..133, value: TStringValue { inner: Single( TString { range: 119..133, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 121..132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..127, id: Name("foo"), ctx: Load, @@ -593,25 +593,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..154, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..154, value: TStringValue { inner: Single( TString { range: 134..154, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 136..153, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..142, id: Name("foo"), ctx: Load, @@ -627,12 +627,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 147..152, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 147..152, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f ", }, ), @@ -656,25 +656,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..173, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..173, value: TStringValue { inner: Single( TString { range: 155..173, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 157..172, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..163, id: Name("foo"), ctx: Load, @@ -705,30 +705,30 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..190, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..190, value: TStringValue { inner: Single( TString { range: 174..190, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 176..189, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..183, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..180, value: Int( 1, @@ -737,7 +737,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..183, value: Int( 2, @@ -774,39 +774,39 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..217, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..217, value: TStringValue { inner: Single( TString { range: 191..217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 193..216, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..210, value: TStringValue { inner: Single( TString { range: 194..210, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 196..209, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..203, value: Float( 3.1415, @@ -823,12 +823,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 205..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 205..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".1f", }, ), @@ -853,12 +853,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 211..215, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 211..215, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "*^20", }, ), @@ -882,30 +882,30 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..255, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 219..255, items: [ DictItem { key: Some( TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 220..250, value: TStringValue { inner: Concatenated( [ TString { range: 220..227, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 222..226, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo ", }, ), @@ -918,26 +918,26 @@ Module( }, TString { range: 228..243, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 230..234, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "bar ", }, ), Interpolation( InterpolatedElement { range: 234..241, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..240, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..236, id: Name("x"), ctx: Load, @@ -946,7 +946,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..240, id: Name("y"), ctx: Load, @@ -962,7 +962,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 241..242, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " ", }, ), @@ -975,12 +975,12 @@ Module( }, TString { range: 244..250, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 246..249, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "baz", }, ), @@ -999,7 +999,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 252..254, value: Int( 10, @@ -1014,11 +1014,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 256..347, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 262..265, id: Name("foo"), ctx: Load, @@ -1027,20 +1027,20 @@ Module( cases: [ MatchCase { range: 271..295, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 276..281, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 276..281, value: StringLiteralValue { inner: Single( StringLiteral { range: 276..281, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "one", flags: StringLiteralFlags { quote_style: Double, @@ -1058,7 +1058,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 291..295, }, ), @@ -1066,14 +1066,14 @@ Module( }, MatchCase { range: 300..347, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 305..333, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 305..333, value: StringLiteralValue { inner: Concatenated( @@ -1081,7 +1081,7 @@ Module( strings: [ StringLiteral { range: 305..318, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "implicitly ", flags: StringLiteralFlags { quote_style: Double, @@ -1091,7 +1091,7 @@ Module( }, StringLiteral { range: 319..333, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "concatenated", flags: StringLiteralFlags { quote_style: Double, @@ -1112,7 +1112,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 343..347, }, ), @@ -1123,32 +1123,32 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 349..366, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 349..366, value: TStringValue { inner: Single( TString { range: 349..366, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 351..352, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\", }, ), Interpolation( InterpolatedElement { range: 352..357, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 353..356, id: Name("foo"), ctx: Load, @@ -1162,17 +1162,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 357..358, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\", }, ), Interpolation( InterpolatedElement { range: 358..365, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 359..362, id: Name("bar"), ctx: Load, @@ -1183,12 +1183,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 363..364, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 363..364, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\", }, ), @@ -1212,22 +1212,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 367..381, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 367..381, value: TStringValue { inner: Single( TString { range: 367..381, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 369..380, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\\{foo\\}", }, ), @@ -1246,25 +1246,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 382..422, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 382..422, value: TStringValue { inner: Single( TString { range: 382..422, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 386..419, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 392..395, id: Name("foo"), ctx: Load, @@ -1275,12 +1275,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 396..418, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 396..418, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "x\n y\n z\n", }, ), @@ -1304,25 +1304,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 423..441, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 423..441, value: TStringValue { inner: Single( TString { range: 423..441, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 425..440, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 430..433, id: Name("foo"), ctx: Load, @@ -1353,32 +1353,32 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 443..488, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 443..488, value: TStringValue { inner: Single( TString { range: 443..488, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 445..452, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "normal ", }, ), Interpolation( InterpolatedElement { range: 452..457, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 453..456, id: Name("foo"), ctx: Load, @@ -1392,17 +1392,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 457..470, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " {another} ", }, ), Interpolation( InterpolatedElement { range: 470..475, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 471..474, id: Name("bar"), ctx: Load, @@ -1416,17 +1416,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 475..478, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " {", }, ), Interpolation( InterpolatedElement { range: 478..485, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 479..484, id: Name("three"), ctx: Load, @@ -1440,7 +1440,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 485..487, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "}", }, ), @@ -1459,32 +1459,32 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 489..531, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 489..531, value: TStringValue { inner: Single( TString { range: 489..531, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 491..498, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "normal ", }, ), Interpolation( InterpolatedElement { range: 498..505, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 499..502, id: Name("foo"), ctx: Load, @@ -1498,17 +1498,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 505..506, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " ", }, ), Interpolation( InterpolatedElement { range: 506..513, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 507..510, id: Name("bar"), ctx: Load, @@ -1522,17 +1522,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 513..514, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " ", }, ), Interpolation( InterpolatedElement { range: 514..521, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 515..518, id: Name("baz"), ctx: Load, @@ -1546,17 +1546,17 @@ Module( Literal( InterpolatedStringLiteralElement { range: 521..522, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " ", }, ), Interpolation( InterpolatedElement { range: 522..530, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 523..529, id: Name("foobar"), ctx: Load, @@ -1582,32 +1582,32 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 532..551, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 532..551, value: TStringValue { inner: Single( TString { range: 532..551, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 534..541, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "normal ", }, ), Interpolation( InterpolatedElement { range: 541..550, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 542..543, id: Name("x"), ctx: Load, @@ -1618,12 +1618,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 544..549, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 544..549, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "y + 2", }, ), @@ -1647,25 +1647,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 552..570, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 552..570, value: TStringValue { inner: Single( TString { range: 552..570, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 554..569, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 555..556, id: Name("x"), ctx: Load, @@ -1676,28 +1676,28 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 557..568, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 557..568, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 558..567, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 558..565, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 558..561, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 559..560, value: Int( 1, @@ -1710,14 +1710,14 @@ Module( attr: Identifier { id: Name("pop"), range: 562..565, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 565..567, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1748,44 +1748,42 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 571..590, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 571..590, value: TStringValue { inner: Single( TString { range: 571..590, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 573..589, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 575..587, parameters: Some( Parameters { range: 582..583, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 582..583, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 582..583, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 582..583, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1799,12 +1797,12 @@ Module( ), body: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 584..587, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 585..586, id: Name("x"), ctx: Load, @@ -1835,25 +1833,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 591..599, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 591..599, value: TStringValue { inner: Single( TString { range: 591..599, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 593..598, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 594..595, id: Name("x"), ctx: Load, @@ -1884,25 +1882,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 600..613, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 600..613, value: TStringValue { inner: Single( TString { range: 600..613, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 602..612, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 607..608, id: Name("x"), ctx: Load, @@ -1933,25 +1931,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 614..623, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 614..623, value: TStringValue { inner: Single( TString { range: 614..623, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 616..622, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 617..618, id: Name("x"), ctx: Load, @@ -1982,25 +1980,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 624..638, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 624..638, value: TStringValue { inner: Single( TString { range: 624..638, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 626..637, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 627..628, id: Name("x"), ctx: Load, @@ -2011,12 +2009,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 629..636, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 629..636, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f!r =", }, ), @@ -2040,25 +2038,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 639..655, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 639..655, value: TStringValue { inner: Single( TString { range: 639..655, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 641..654, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 642..643, id: Name("x"), ctx: Load, @@ -2074,12 +2072,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 650..653, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 650..653, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f", }, ), @@ -2103,25 +2101,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 656..669, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 656..669, value: TStringValue { inner: Single( TString { range: 656..669, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 658..668, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 659..660, id: Name("x"), ctx: Load, @@ -2132,12 +2130,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 661..667, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 661..667, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f=!r", }, ), @@ -2161,23 +2159,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 670..685, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 670..685, value: TStringValue { inner: Concatenated( [ TString { range: 670..678, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 672..677, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello", }, ), @@ -2190,15 +2188,15 @@ Module( }, TString { range: 679..685, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 681..684, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 682..683, id: Name("x"), ctx: Load, @@ -2225,26 +2223,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 686..699, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 686..699, value: TStringValue { inner: Concatenated( [ TString { range: 686..692, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 688..691, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 689..690, id: Name("x"), ctx: Load, @@ -2264,15 +2262,15 @@ Module( }, TString { range: 693..699, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 695..698, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 696..697, id: Name("y"), ctx: Load, @@ -2299,26 +2297,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 700..715, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 700..715, value: TStringValue { inner: Concatenated( [ TString { range: 700..706, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 702..705, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 703..704, id: Name("x"), ctx: Load, @@ -2338,12 +2336,12 @@ Module( }, TString { range: 707..715, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 709..714, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "world", }, ), @@ -2363,37 +2361,37 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 716..760, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 716..760, value: TStringValue { inner: Single( TString { range: 716..760, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 718..743, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Invalid args in command: ", }, ), Interpolation( InterpolatedElement { range: 743..759, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 744..758, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 744..751, id: Name("command"), ctx: Load, @@ -2401,11 +2399,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 753..758, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 754..758, id: Name("args"), ctx: Load, @@ -2439,23 +2437,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 761..781, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 761..781, value: TStringValue { inner: Concatenated( [ TString { range: 761..767, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 763..766, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo", }, ), @@ -2468,15 +2466,15 @@ Module( }, TString { range: 768..774, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 770..773, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 771..772, id: Name("x"), ctx: Load, @@ -2496,12 +2494,12 @@ Module( }, TString { range: 775..781, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 777..780, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "bar", }, ), @@ -2521,23 +2519,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 782..832, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 788..830, value: TStringValue { inner: Concatenated( [ TString { range: 788..792, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 790..791, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a", }, ), @@ -2550,12 +2548,12 @@ Module( }, TString { range: 797..801, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 799..800, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "b", }, ), @@ -2568,12 +2566,12 @@ Module( }, TString { range: 806..810, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 808..809, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "c", }, ), @@ -2586,12 +2584,12 @@ Module( }, TString { range: 815..820, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 818..819, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "d", }, ), @@ -2606,12 +2604,12 @@ Module( }, TString { range: 825..830, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 828..829, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "e", }, ), @@ -2633,54 +2631,54 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 844..863, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 844..863, value: TStringValue { inner: Single( TString { range: 844..863, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 846..862, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 847..861, value: FStringValue { inner: Single( FString( FString { range: 847..861, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 849..860, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 850..859, value: TStringValue { inner: Single( TString { range: 850..859, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 852..858, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 853..857, id: Name("this"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap index 4b019c8755..85d7b0c3f6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/tuple.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..276, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..21, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..21, elts: [], ctx: Load, @@ -27,11 +27,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..26, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..25, elts: [], ctx: Load, @@ -42,16 +42,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..37, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..37, elts: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..31, elts: [], ctx: Load, @@ -60,7 +60,7 @@ Module( ), Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..36, elts: [], ctx: Load, @@ -76,16 +76,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..42, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..42, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("a"), ctx: Load, @@ -100,16 +100,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..49, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..49, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, id: Name("a"), ctx: Load, @@ -117,7 +117,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("b"), ctx: Load, @@ -132,16 +132,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..57, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..57, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, id: Name("a"), ctx: Load, @@ -149,7 +149,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, id: Name("b"), ctx: Load, @@ -164,16 +164,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..66, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..65, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, id: Name("a"), ctx: Load, @@ -181,7 +181,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, id: Name("b"), ctx: Load, @@ -196,16 +196,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..92, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..92, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("a"), ctx: Load, @@ -220,16 +220,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..97, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..97, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, id: Name("a"), ctx: Load, @@ -237,7 +237,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, id: Name("b"), ctx: Load, @@ -252,16 +252,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..103, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..103, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, id: Name("a"), ctx: Load, @@ -269,7 +269,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..102, id: Name("b"), ctx: Load, @@ -284,20 +284,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..129, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..129, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..128, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("a"), ctx: Load, @@ -315,16 +315,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..135, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..135, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..131, id: Name("a"), ctx: Load, @@ -332,11 +332,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..135, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..135, id: Name("b"), ctx: Load, @@ -354,24 +354,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..161, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..161, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..142, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..142, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..138, id: Name("a"), ctx: Load, @@ -380,7 +380,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..142, id: Name("b"), ctx: Load, @@ -393,15 +393,15 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..152, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..152, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..152, id: Name("x"), ctx: Load, @@ -414,7 +414,7 @@ Module( ), Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..156, elts: [], ctx: Load, @@ -423,11 +423,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..161, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..161, elts: [], ctx: Load, @@ -446,20 +446,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..167, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..167, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..165, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..165, id: Name("a"), ctx: Load, @@ -477,16 +477,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..175, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..175, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..170, id: Name("a"), ctx: Load, @@ -494,11 +494,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..174, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 173..174, id: Name("b"), ctx: Load, @@ -516,24 +516,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..203, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..203, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..183, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..183, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..179, id: Name("a"), ctx: Load, @@ -542,7 +542,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..183, id: Name("b"), ctx: Load, @@ -555,15 +555,15 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..193, value: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..193, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..193, id: Name("x"), ctx: Load, @@ -576,7 +576,7 @@ Module( ), Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 195..197, elts: [], ctx: Load, @@ -585,11 +585,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 199..202, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..202, elts: [], ctx: Load, @@ -608,20 +608,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..233, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..233, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..231, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..226, id: Name("x"), ctx: Store, @@ -629,7 +629,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..231, value: Int( 1, @@ -647,16 +647,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..245, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..245, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..236, id: Name("x"), ctx: Load, @@ -664,11 +664,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..244, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..239, id: Name("y"), ctx: Store, @@ -676,7 +676,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 243..244, value: Int( 2, @@ -694,16 +694,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..260, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 246..260, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 247..248, id: Name("x"), ctx: Load, @@ -711,11 +711,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..256, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..251, id: Name("y"), ctx: Store, @@ -723,7 +723,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..256, value: Int( 2, @@ -734,7 +734,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..259, id: Name("z"), ctx: Load, @@ -749,16 +749,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 261..275, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 261..275, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 261..262, id: Name("x"), ctx: Load, @@ -766,11 +766,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..271, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..266, id: Name("y"), ctx: Store, @@ -778,7 +778,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 270..271, value: Int( 2, @@ -789,7 +789,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..275, id: Name("z"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap index cf09c3dcf5..5098bc6044 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/unary_op.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..276, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..11, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..11, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, value: Int( 1, @@ -34,16 +34,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..14, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..14, op: UAdd, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..14, value: Int( 1, @@ -56,16 +56,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..17, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..17, op: Invert, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, value: Int( 1, @@ -78,16 +78,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..23, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..23, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("x"), ctx: Load, @@ -99,26 +99,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..40, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..40, op: USub, operand: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..40, op: USub, operand: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..40, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, value: Int( 1, @@ -135,26 +135,26 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..45, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..45, op: USub, operand: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..45, op: UAdd, operand: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..45, op: Invert, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, value: Int( 1, @@ -171,31 +171,31 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..53, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..53, op: Not, operand: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..53, op: USub, operand: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..53, op: UAdd, operand: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..53, op: Invert, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, value: Int( 1, @@ -214,21 +214,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..63, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..63, op: Not, operand: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..63, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, id: Name("x"), ctx: Load, @@ -242,20 +242,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..93, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..93, op: USub, operand: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..93, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..93, value: Int( 1, @@ -270,24 +270,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..109, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..109, op: UAdd, operand: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..109, left: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..103, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, value: Int( 1, @@ -299,12 +299,12 @@ Module( op: Pow, right: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..109, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, value: Int( 2, @@ -321,21 +321,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..117, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..117, op: Invert, operand: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..117, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..113, value: Int( 1, @@ -344,7 +344,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..116, value: Int( 2, @@ -362,20 +362,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..124, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..124, left: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..120, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, value: Int( 1, @@ -387,7 +387,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..124, value: Int( 2, @@ -400,28 +400,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 212..246, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 212..246, op: Or, values: [ BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 212..223, op: And, values: [ UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 212..217, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 216..217, id: Name("a"), ctx: Load, @@ -431,7 +431,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..223, id: Name("b"), ctx: Load, @@ -442,22 +442,22 @@ Module( ), BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..246, op: And, values: [ UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..236, op: Not, operand: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..236, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..232, id: Name("c"), ctx: Load, @@ -466,7 +466,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 235..236, id: Name("d"), ctx: Load, @@ -478,12 +478,12 @@ Module( ), UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..246, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..246, id: Name("e"), ctx: Load, @@ -501,20 +501,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 247..259, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 247..259, op: Not, operand: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 252..258, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 252..253, id: Name("x"), ctx: Store, @@ -522,7 +522,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 257..258, value: Int( 1, @@ -537,20 +537,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..275, value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..275, op: Not, operand: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..275, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..265, id: Name("a"), ctx: Load, @@ -559,12 +559,12 @@ Module( op: BitOr, right: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..274, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 273..274, id: Name("b"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap index cafb60b460..e137cd09fc 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/yield.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..166, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, value: None, }, @@ -25,16 +25,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..13, id: Name("x"), ctx: Load, @@ -47,20 +47,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..25, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..25, value: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..25, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, id: Name("x"), ctx: Load, @@ -69,7 +69,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, value: Int( 1, @@ -85,22 +85,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..39, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..39, value: Some( BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..39, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, id: Name("x"), ctx: Load, @@ -108,7 +108,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("y"), ctx: Load, @@ -124,20 +124,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..52, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..52, value: Some( Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..52, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..50, id: Name("call"), ctx: Load, @@ -145,7 +145,7 @@ Module( ), arguments: Arguments { range: 50..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -158,21 +158,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..65, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..65, value: Some( List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..65, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, value: Int( 1, @@ -181,7 +181,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, value: Int( 2, @@ -199,21 +199,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..78, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..78, value: Some( Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..78, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..74, value: Int( 3, @@ -222,7 +222,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..77, value: Int( 4, @@ -239,23 +239,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..91, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..91, value: Some( Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..91, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..87, id: Name("x"), ctx: Load, @@ -264,7 +264,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, value: Int( 5, @@ -282,21 +282,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..102, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..102, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..102, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, id: Name("x"), ctx: Load, @@ -304,7 +304,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..102, id: Name("y"), ctx: Load, @@ -322,21 +322,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..115, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..115, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..115, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..111, id: Name("x"), ctx: Load, @@ -344,7 +344,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..114, id: Name("y"), ctx: Load, @@ -362,20 +362,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..128, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..128, value: Some( Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..128, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, id: Name("x"), ctx: Load, @@ -387,7 +387,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, id: Name("y"), ctx: Load, @@ -403,20 +403,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..143, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..143, value: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..142, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..137, id: Name("x"), ctx: Store, @@ -424,7 +424,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..142, value: Int( 1, @@ -440,21 +440,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..155, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..155, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..155, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..151, id: Name("x"), ctx: Load, @@ -462,11 +462,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..155, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..155, id: Name("y"), ctx: Load, @@ -487,25 +487,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..165, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..165, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..165, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..164, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..164, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap index 0d7bfe36e3..86e8a9ac06 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/expressions/yield_from.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..199, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, id: Name("x"), ctx: Load, @@ -32,19 +32,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..29, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..29, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..29, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("x"), ctx: Load, @@ -53,7 +53,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, value: Int( 1, @@ -68,21 +68,21 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..48, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..48, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..48, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("x"), ctx: Load, @@ -90,7 +90,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("y"), ctx: Load, @@ -105,19 +105,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..66, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..66, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..66, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..64, id: Name("call"), ctx: Load, @@ -125,7 +125,7 @@ Module( ), arguments: Arguments { range: 64..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -137,20 +137,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..84, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..84, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..84, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, value: Int( 1, @@ -159,7 +159,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, value: Int( 2, @@ -176,20 +176,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..102, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..102, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..102, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, value: Int( 3, @@ -198,7 +198,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, value: Int( 4, @@ -214,22 +214,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..120, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..120, value: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..120, items: [ DictItem { key: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..116, id: Name("x"), ctx: Load, @@ -238,7 +238,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..119, value: Int( 5, @@ -255,20 +255,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..138, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..138, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..138, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..134, id: Name("x"), ctx: Load, @@ -276,7 +276,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..137, id: Name("y"), ctx: Load, @@ -293,19 +293,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..156, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..156, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..156, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..151, id: Name("x"), ctx: Load, @@ -317,7 +317,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..156, id: Name("y"), ctx: Load, @@ -332,19 +332,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..176, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..176, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..175, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..170, id: Name("x"), ctx: Store, @@ -352,7 +352,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..175, value: Int( 1, @@ -367,20 +367,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..199, value: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..199, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..199, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, id: Name("x"), ctx: Load, @@ -388,15 +388,15 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..198, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..198, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..194, id: Name("x"), ctx: Load, @@ -405,7 +405,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..198, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap index 8d3f2a8743..05a956dcf6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/for_in_target_valid_ex ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..89, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, is_async: false, target: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..13, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("d"), ctx: Load, @@ -29,11 +29,11 @@ Module( ), slice: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..12, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -45,7 +45,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, id: Name("y"), ctx: Load, @@ -59,7 +59,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..23, id: Name("target"), ctx: Load, @@ -68,11 +68,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, }, ), @@ -84,20 +84,20 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..57, is_async: false, target: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..44, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..40, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("x"), ctx: Load, @@ -109,7 +109,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("y"), ctx: Load, @@ -120,7 +120,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, value: Int( 0, @@ -132,7 +132,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..52, id: Name("iter"), ctx: Load, @@ -141,11 +141,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..57, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..57, }, ), @@ -157,20 +157,20 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..88, is_async: false, target: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..75, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..69, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..64, id: Name("x"), ctx: Load, @@ -182,7 +182,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("y"), ctx: Load, @@ -194,14 +194,14 @@ Module( attr: Identifier { id: Name("attr"), range: 71..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Store, }, ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..83, id: Name("iter"), ctx: Load, @@ -210,11 +210,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap index e981ecdd5d..bebfeca6cb 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/for_iter_unpack_py38.p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..112, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..65, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Store, @@ -25,16 +25,16 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..60, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..55, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, id: Name("a"), ctx: Load, @@ -45,7 +45,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..59, id: Name("b"), ctx: Load, @@ -59,11 +59,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..65, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..65, }, ), @@ -75,12 +75,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..88, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, id: Name("x"), ctx: Store, @@ -88,12 +88,12 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..83, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("a"), ctx: Load, @@ -101,11 +101,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..82, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, id: Name("b"), ctx: Load, @@ -122,11 +122,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, }, ), @@ -138,12 +138,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..111, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, id: Name("x"), ctx: Store, @@ -151,16 +151,16 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..106, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..101, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, id: Name("a"), ctx: Load, @@ -171,11 +171,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..105, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, id: Name("b"), ctx: Load, @@ -192,11 +192,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..111, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..111, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap index 2579c5e35f..57ae9806a2 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/for_iter_unpack_py39.p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..106, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..63, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Store, @@ -25,16 +25,16 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..58, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..54, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, id: Name("a"), ctx: Load, @@ -45,7 +45,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, id: Name("b"), ctx: Load, @@ -59,11 +59,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, }, ), @@ -75,12 +75,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..84, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Store, @@ -88,12 +88,12 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..79, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, id: Name("a"), ctx: Load, @@ -101,11 +101,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..79, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, id: Name("b"), ctx: Load, @@ -122,11 +122,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, }, ), @@ -138,12 +138,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..105, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, id: Name("x"), ctx: Store, @@ -151,16 +151,16 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..100, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..96, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..96, id: Name("a"), ctx: Load, @@ -171,11 +171,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..100, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..100, id: Name("b"), ctx: Load, @@ -192,11 +192,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..105, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..105, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap index 4e27abaf58..dc39444395 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap @@ -7,22 +7,22 @@ input_file: crates/ruff_python_parser/resources/inline/ok/from_import_no_space.p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..30, body: [ ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, module: None, names: [ Alias { range: 12..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 12..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -32,17 +32,17 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..29, module: None, names: [ Alias { range: 28..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 28..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap index ffbf2fa38d..6afb4d35ee 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap @@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/ok/from_import_soft_keywo ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..104, body: [ ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..25, module: Some( Identifier { id: Name("match"), range: 5..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 18..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("pattern"), range: 18..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -38,23 +38,23 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..46, module: Some( Identifier { id: Name("type"), range: 31..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 43..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("bar"), range: 43..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -64,23 +64,23 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..71, module: Some( Identifier { id: Name("case"), range: 52..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 64..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("pattern"), range: 64..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -90,23 +90,23 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..103, module: Some( Identifier { id: Name("match.type.case"), range: 77..92, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 100..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("foo"), range: 100..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap index afc649c201..5d66543330 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap @@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/ok/from_import_stmt_termi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..97, body: [ ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, module: Some( Identifier { id: Name("a"), range: 5..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 15..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 15..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -48,33 +48,33 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..41, module: Some( Identifier { id: Name("a"), range: 26..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 36..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 36..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 39..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -84,16 +84,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..47, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..47, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, id: Name("x"), ctx: Load, @@ -101,7 +101,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, id: Name("y"), ctx: Load, @@ -116,33 +116,33 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..66, module: Some( Identifier { id: Name("a"), range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 62..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 62..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 65..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 65..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -152,16 +152,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..72, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..72, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Load, @@ -169,7 +169,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, id: Name("y"), ctx: Load, @@ -184,33 +184,33 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..91, module: Some( Identifier { id: Name("a"), range: 78..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 87..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 87..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 90..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 90..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -220,16 +220,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..96, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..96, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..93, id: Name("x"), ctx: Load, @@ -237,7 +237,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..96, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap index 386e5a0f15..331e7ba86f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap @@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/ok/fstring_format_spec_te ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..43, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, value: FStringValue { inner: Single( FString( FString { range: 0..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 2..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello ", }, ), Interpolation( InterpolatedElement { range: 8..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, id: Name("x"), ctx: Load, @@ -49,7 +49,7 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 11..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [], }, ), @@ -58,7 +58,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 12..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " world", }, ), @@ -78,33 +78,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..42, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..42, value: FStringValue { inner: Single( FString( FString { range: 20..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 22..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "hello ", }, ), Interpolation( InterpolatedElement { range: 28..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("x"), ctx: Load, @@ -115,12 +115,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 31..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 31..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: ".3f", }, ), @@ -132,7 +132,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 35..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " world", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap index 68a01e322f..900be0a882 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap @@ -7,43 +7,41 @@ input_file: crates/ruff_python_parser/resources/inline/ok/function_def_parameter ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..56, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..55, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..43, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 13..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 13..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("first"), range: 13..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, id: Name("int"), ctx: Load, @@ -55,19 +53,19 @@ Module( }, ParameterWithDefault { range: 29..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 29..40, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("second"), range: 29..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..40, id: Name("int"), ctx: Load, @@ -85,7 +83,7 @@ Module( returns: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..50, id: Name("int"), ctx: Load, @@ -95,11 +93,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..55, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..55, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap index 2008c48ad0..207800f85e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/function_def_parenthes ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..54, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..9, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -36,12 +34,12 @@ Module( returns: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..19, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("int"), ctx: Load, @@ -56,11 +54,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, }, ), @@ -71,21 +69,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..53, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 29..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 32..34, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -95,12 +91,12 @@ Module( returns: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..48, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, id: Name("int"), ctx: Load, @@ -108,7 +104,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..47, id: Name("str"), ctx: Load, @@ -123,11 +119,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..53, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..53, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap index f3762e02fd..5415e94eee 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/function_def_valid_ret ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..97, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..27, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..9, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -36,11 +34,11 @@ Module( returns: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..22, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, id: Name("int"), ctx: Load, @@ -49,7 +47,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, id: Name("str"), ctx: Load, @@ -61,11 +59,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, }, ), @@ -76,21 +74,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..57, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 32..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 35..37, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -100,26 +96,24 @@ Module( returns: Some( Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..52, parameters: Some( Parameters { range: 48..49, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 48..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 48..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 48..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -133,7 +127,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, id: Name("x"), ctx: Load, @@ -145,11 +139,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..57, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..57, }, ), @@ -160,21 +154,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..96, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 62..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 65..67, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -184,18 +176,18 @@ Module( returns: Some( If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..91, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..82, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..74, id: Name("int"), ctx: Load, @@ -203,7 +195,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..91, id: Name("str"), ctx: Load, @@ -215,11 +207,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..96, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..96, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap index c4bcad7813..4dee727ea1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap @@ -7,33 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/ok/function_type_params_p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..62, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..61, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 48..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 51..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -44,9 +44,7 @@ Module( ), parameters: Parameters { range: 54..56, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -57,11 +55,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap index e5a51faf37..2282955763 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap @@ -7,41 +7,41 @@ input_file: crates/ruff_python_parser/resources/inline/ok/global_stmt.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, body: [ Global( StmtGlobal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, names: [ Identifier { id: Name("x"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, ), Global( StmtGlobal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..23, names: [ Identifier { id: Name("x"), range: 16..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, Identifier { id: Name("y"), range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, Identifier { id: Name("z"), range: 22..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap index 15b856b9bc..12b0c4ea59 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap @@ -7,27 +7,27 @@ input_file: crates/ruff_python_parser/resources/inline/ok/import_as_name_soft_ke ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..58, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, names: [ Alias { range: 7..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("foo"), range: 7..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("match"), range: 14..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -36,22 +36,22 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..38, names: [ Alias { range: 27..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("bar"), range: 27..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("case"), range: 34..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -60,22 +60,22 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..57, names: [ Alias { range: 46..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("baz"), range: 46..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("type"), range: 53..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap index 507563d546..0412ecc38f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap @@ -7,31 +7,31 @@ input_file: crates/ruff_python_parser/resources/inline/ok/import_stmt_terminator ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..42, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, names: [ Alias { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 10..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 10..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -40,26 +40,26 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..24, names: [ Alias { range: 20..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 20..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 23..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 23..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -68,26 +68,26 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..36, names: [ Alias { range: 32..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 32..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 35..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 35..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -96,16 +96,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..41, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..41, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, id: Name("c"), ctx: Load, @@ -113,7 +113,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("d"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap index 4dc3301709..355e84ac03 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/irrefutable_case_patte ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..176, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..42, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -25,14 +25,14 @@ Module( cases: [ MatchCase { range: 13..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, value: Int( 2, @@ -45,11 +45,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..24, }, ), @@ -59,17 +59,17 @@ Module( }, MatchCase { range: 29..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 34..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("var"), range: 34..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -78,11 +78,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, }, ), @@ -95,11 +95,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..83, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, id: Name("x"), ctx: Load, @@ -108,14 +108,14 @@ Module( cases: [ MatchCase { range: 56..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 61..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..62, value: Int( 2, @@ -128,11 +128,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..67, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..67, }, ), @@ -142,11 +142,11 @@ Module( }, MatchCase { range: 72..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 77..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -155,11 +155,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..83, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..83, }, ), @@ -172,11 +172,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..175, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("x"), ctx: Load, @@ -185,17 +185,17 @@ Module( cases: [ MatchCase { range: 97..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 102..105, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("var"), range: 102..105, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -203,7 +203,7 @@ Module( guard: Some( BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..113, value: true, }, @@ -212,11 +212,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..118, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..118, }, ), @@ -226,14 +226,14 @@ Module( }, MatchCase { range: 164..175, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 169..170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..170, value: Int( 2, @@ -246,11 +246,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..175, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..175, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap index 470474aa7f..f98e1ddaa3 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/iter_unpack_return_py3 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..93, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..59, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..47, id: Name("rest"), ctx: Store, @@ -26,12 +26,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..59, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 4, @@ -40,7 +40,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 5, @@ -49,7 +49,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, value: Int( 6, @@ -65,21 +65,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..92, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 65..67, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -90,17 +88,17 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..92, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..92, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, value: Int( 1, @@ -109,7 +107,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..81, value: Int( 2, @@ -118,7 +116,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, value: Int( 3, @@ -127,11 +125,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..91, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..91, id: Name("rest"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap index e0f7c8ec22..4b66019a93 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/iter_unpack_return_py3 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..91, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..59, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..47, id: Name("rest"), ctx: Store, @@ -26,12 +26,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..59, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 4, @@ -40,7 +40,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 5, @@ -49,7 +49,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, value: Int( 6, @@ -65,21 +65,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..90, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 65..67, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -90,17 +88,17 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..90, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..90, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..77, value: Int( 1, @@ -109,7 +107,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, value: Int( 2, @@ -118,7 +116,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, value: Int( 3, @@ -127,11 +125,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..90, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..90, id: Name("rest"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap index 092f50c312..6738798560 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/iter_unpack_yield_py37 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..92, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..59, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..47, id: Name("rest"), ctx: Store, @@ -26,12 +26,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..59, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 4, @@ -40,7 +40,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 5, @@ -49,7 +49,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, value: Int( 6, @@ -65,21 +65,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..91, is_async: false, decorator_list: [], name: Identifier { id: Name("g"), range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 65..67, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -90,21 +88,21 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..91, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..91, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..91, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..77, value: Int( 1, @@ -113,7 +111,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..80, value: Int( 2, @@ -122,7 +120,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, value: Int( 3, @@ -131,11 +129,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..90, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..90, id: Name("rest"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap index 78df654105..9f1c150b3d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/inline/ok/iter_unpack_yield_py38 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..128, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..59, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..47, id: Name("rest"), ctx: Store, @@ -26,12 +26,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..59, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 4, @@ -40,7 +40,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 5, @@ -49,7 +49,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, value: Int( 6, @@ -65,21 +65,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..89, is_async: false, decorator_list: [], name: Identifier { id: Name("g"), range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 65..67, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -90,21 +88,21 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..89, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..89, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..89, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, value: Int( 1, @@ -113,7 +111,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, value: Int( 2, @@ -122,7 +120,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, value: Int( 3, @@ -131,11 +129,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..89, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..89, id: Name("rest"), ctx: Load, @@ -159,21 +157,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..127, is_async: false, decorator_list: [], name: Identifier { id: Name("h"), range: 94..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 95..97, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -184,21 +180,21 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..127, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..127, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..127, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, value: Int( 1, @@ -207,17 +203,17 @@ Module( ), Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..123, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..123, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..116, value: Int( 2, @@ -226,11 +222,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..123, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..123, id: Name("rest"), ctx: Load, @@ -249,7 +245,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..127, value: Int( 3, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap index 7a76f5f14c..5976043695 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/lambda_with_no_paramet ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..10, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..9, parameters: None, body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap index c407279f9d..30d038eb10 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap @@ -7,35 +7,33 @@ input_file: crates/ruff_python_parser/resources/inline/ok/lambda_with_valid_body ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..152, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..11, parameters: Some( Parameters { range: 7..8, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -49,7 +47,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, id: Name("x"), ctx: Load, @@ -61,30 +59,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..38, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..38, parameters: Some( Parameters { range: 19..20, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 19..20, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -98,18 +94,18 @@ Module( ), body: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..38, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..31, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..23, id: Name("x"), ctx: Load, @@ -117,7 +113,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, id: Name("y"), ctx: Load, @@ -131,30 +127,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..56, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..56, parameters: Some( Parameters { range: 46..47, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 46..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 46..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 46..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -168,11 +162,11 @@ Module( ), body: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..56, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, id: Name("x"), ctx: Load, @@ -186,30 +180,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..82, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..82, parameters: Some( Parameters { range: 64..65, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -223,26 +215,24 @@ Module( ), body: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..82, 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("y"), range: 74..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -256,11 +246,11 @@ Module( ), body: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..82, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("x"), ctx: Load, @@ -269,7 +259,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, id: Name("y"), ctx: Load, @@ -285,30 +275,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..102, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..102, parameters: Some( Parameters { range: 90..91, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 90..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 90..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 90..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -322,12 +310,12 @@ Module( ), body: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..101, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, id: Name("x"), ctx: Load, @@ -342,35 +330,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..151, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..151, elts: [ Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..147, parameters: Some( Parameters { range: 143..144, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 143..144, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 143..144, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 143..144, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -384,7 +370,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, id: Name("x"), ctx: Load, @@ -394,11 +380,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..151, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..151, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap index a4b1204457..155afee96f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_after_py310.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..80, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..79, subject: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, value: Int( 2, @@ -26,14 +26,14 @@ Module( cases: [ MatchCase { range: 59..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..65, value: Int( 1, @@ -46,7 +46,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..79, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap index c300ac4843..f69f8a5947 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_as_pattern.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..60, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..32, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..9, id: Name("foo"), ctx: Load, @@ -25,17 +25,17 @@ Module( cases: [ MatchCase { range: 15..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 20..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("foo_bar"), range: 20..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -44,11 +44,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..32, }, ), @@ -61,11 +61,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..59, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, id: Name("foo"), ctx: Load, @@ -74,11 +74,11 @@ Module( cases: [ MatchCase { range: 48..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -87,11 +87,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..59, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..59, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap index 6ca3b67057..7795d1b45c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_as_pattern_soft_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..91, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..29, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..9, id: Name("foo"), ctx: Load, @@ -25,17 +25,17 @@ Module( cases: [ MatchCase { range: 15..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 20..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("case"), range: 20..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -44,11 +44,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, }, ), @@ -61,11 +61,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..60, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..39, id: Name("foo"), ctx: Load, @@ -74,17 +74,17 @@ Module( cases: [ MatchCase { range: 45..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 50..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("match"), range: 50..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -93,11 +93,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, }, ), @@ -110,11 +110,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..90, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..70, id: Name("foo"), ctx: Load, @@ -123,17 +123,17 @@ Module( cases: [ MatchCase { range: 76..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 81..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("type"), range: 81..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -142,11 +142,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..90, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..90, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap index 17a7f854b3..0f911c5ce4 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_attr_pattern_sof ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..131, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..130, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..9, id: Name("foo"), ctx: Load, @@ -25,18 +25,18 @@ Module( cases: [ MatchCase { range: 15..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 20..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..29, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..25, id: Name("match"), ctx: Load, @@ -45,7 +45,7 @@ Module( attr: Identifier { id: Name("bar"), range: 26..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -56,11 +56,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, }, ), @@ -70,18 +70,18 @@ Module( }, MatchCase { range: 39..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 44..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..52, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..48, id: Name("case"), ctx: Load, @@ -90,7 +90,7 @@ Module( attr: Identifier { id: Name("bar"), range: 49..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -101,11 +101,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..57, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..57, }, ), @@ -115,18 +115,18 @@ Module( }, MatchCase { range: 62..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 67..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..75, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..71, id: Name("type"), ctx: Load, @@ -135,7 +135,7 @@ Module( attr: Identifier { id: Name("bar"), range: 72..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -146,11 +146,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..80, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..80, }, ), @@ -160,38 +160,38 @@ Module( }, MatchCase { range: 85..130, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 90..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..125, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..119, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..114, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..109, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..105, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..100, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..95, id: Name("match"), ctx: Load, @@ -200,7 +200,7 @@ Module( attr: Identifier { id: Name("case"), range: 96..100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -208,7 +208,7 @@ Module( attr: Identifier { id: Name("type"), range: 101..105, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -216,7 +216,7 @@ Module( attr: Identifier { id: Name("bar"), range: 106..109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -224,7 +224,7 @@ Module( attr: Identifier { id: Name("type"), range: 110..114, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -232,7 +232,7 @@ Module( attr: Identifier { id: Name("case"), range: 115..119, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -240,7 +240,7 @@ Module( attr: Identifier { id: Name("match"), range: 120..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -251,11 +251,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..130, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..130, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap index 7c7131c6e5..7eb5caad29 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_classify_as_iden ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..18, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, id: Name("match"), ctx: Load, @@ -32,7 +32,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..17, id: Name("case"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap index e0c274a03d..5377ee65ea 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_classify_as_iden ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..149, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, id: Name("match"), ctx: Load, @@ -26,15 +26,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..18, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..18, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..11, id: Name("match"), ctx: Load, @@ -46,7 +46,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..18, id: Name("foo"), ctx: Load, @@ -59,16 +59,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..31, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..31, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, id: Name("foo"), ctx: Load, @@ -76,7 +76,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..30, id: Name("match"), ctx: Load, @@ -91,16 +91,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..44, value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..44, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..36, id: Name("foo"), ctx: Load, @@ -108,7 +108,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..43, id: Name("match"), ctx: Load, @@ -122,16 +122,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..57, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..57, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..49, id: Name("foo"), ctx: Load, @@ -139,7 +139,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..56, id: Name("match"), ctx: Load, @@ -152,11 +152,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..63, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..63, id: Name("match"), ctx: Load, @@ -166,11 +166,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..75, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..70, id: Name("match"), ctx: Store, @@ -178,7 +178,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..75, id: Name("int"), ctx: Load, @@ -190,16 +190,16 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..82, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..82, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..81, id: Name("match"), ctx: Load, @@ -214,15 +214,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..92, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..92, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..88, id: Name("match"), ctx: Load, @@ -231,7 +231,7 @@ Module( attr: Identifier { id: Name("foo"), range: 89..92, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -240,15 +240,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..104, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..104, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..98, id: Name("match"), ctx: Load, @@ -257,7 +257,7 @@ Module( op: Div, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..104, id: Name("foo"), ctx: Load, @@ -269,15 +269,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..117, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..117, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..110, id: Name("match"), ctx: Load, @@ -286,7 +286,7 @@ Module( op: LShift, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..117, id: Name("foo"), ctx: Load, @@ -298,17 +298,17 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..131, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..131, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 118..123, id: Name("match"), ctx: Load, @@ -316,7 +316,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..131, id: Name("foo"), ctx: Load, @@ -329,15 +329,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..148, value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..148, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..137, id: Name("match"), ctx: Load, @@ -349,7 +349,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..148, id: Name("foo"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap index 2345dca249..7c83386b60 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_classify_as_keyw ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..358, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..9, id: Name("foo"), ctx: Load, @@ -25,11 +25,11 @@ Module( cases: [ MatchCase { range: 15..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 20..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -38,11 +38,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..26, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..26, }, ), @@ -55,11 +55,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..51, subject: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..34, value: Int( 1, @@ -69,11 +69,11 @@ Module( cases: [ MatchCase { range: 40..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 45..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -82,11 +82,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..51, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..51, }, ), @@ -99,11 +99,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..78, subject: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, value: Float( 1.0, @@ -113,11 +113,11 @@ Module( cases: [ MatchCase { range: 67..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 72..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -126,11 +126,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..78, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..78, }, ), @@ -143,11 +143,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..104, subject: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..87, value: Complex { real: 0.0, @@ -158,11 +158,11 @@ Module( cases: [ MatchCase { range: 93..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 98..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -171,11 +171,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..104, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..104, }, ), @@ -188,17 +188,17 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..133, subject: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..116, value: StringLiteralValue { inner: Single( StringLiteral { range: 111..116, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo", flags: StringLiteralFlags { quote_style: Double, @@ -213,11 +213,11 @@ Module( cases: [ MatchCase { range: 122..133, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 127..128, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -226,11 +226,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..133, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..133, }, ), @@ -243,33 +243,33 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..167, subject: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..150, value: FStringValue { inner: Single( FString( FString { range: 140..150, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 142..146, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo ", }, ), Interpolation( InterpolatedElement { range: 146..149, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..148, id: Name("x"), ctx: Load, @@ -295,11 +295,11 @@ Module( cases: [ MatchCase { range: 156..167, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 161..162, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -308,11 +308,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..167, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..167, }, ), @@ -325,16 +325,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..197, subject: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..180, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..176, value: Int( 1, @@ -343,7 +343,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..179, value: Int( 2, @@ -356,11 +356,11 @@ Module( cases: [ MatchCase { range: 186..197, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 191..192, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -369,11 +369,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..197, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..197, }, ), @@ -386,16 +386,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 198..225, subject: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..208, op: Invert, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 205..208, id: Name("foo"), ctx: Load, @@ -406,11 +406,11 @@ Module( cases: [ MatchCase { range: 214..225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 219..220, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -419,11 +419,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..225, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..225, }, ), @@ -436,22 +436,22 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..252, subject: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..235, }, ), cases: [ MatchCase { range: 241..252, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 246..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -460,11 +460,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 249..252, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 249..252, }, ), @@ -477,16 +477,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..283, subject: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..266, op: Not, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 263..266, id: Name("foo"), ctx: Load, @@ -497,11 +497,11 @@ Module( cases: [ MatchCase { range: 272..283, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 277..278, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -510,11 +510,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 280..283, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 280..283, }, ), @@ -527,19 +527,19 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 284..318, subject: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..301, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 296..301, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 296..299, id: Name("foo"), ctx: Load, @@ -547,7 +547,7 @@ Module( ), arguments: Arguments { range: 299..301, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -558,11 +558,11 @@ Module( cases: [ MatchCase { range: 307..318, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 312..313, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -571,11 +571,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 315..318, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 315..318, }, ), @@ -588,30 +588,28 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..357, subject: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 325..340, parameters: Some( Parameters { range: 332..335, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 332..335, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 332..335, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("foo"), range: 332..335, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -625,7 +623,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 337..340, id: Name("foo"), ctx: Load, @@ -636,11 +634,11 @@ Module( cases: [ MatchCase { range: 346..357, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 351..352, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -649,11 +647,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 354..357, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 354..357, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap index d4d62a6c6f..16ff76beb6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_classify_as_keyw ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..170, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..11, id: Name("match"), ctx: Load, @@ -25,11 +25,11 @@ Module( cases: [ MatchCase { range: 17..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 22..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -38,11 +38,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, }, ), @@ -55,11 +55,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..56, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..39, id: Name("case"), ctx: Load, @@ -68,11 +68,11 @@ Module( cases: [ MatchCase { range: 45..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 50..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -81,11 +81,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, }, ), @@ -98,11 +98,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..84, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..67, id: Name("type"), ctx: Load, @@ -111,11 +111,11 @@ Module( cases: [ MatchCase { range: 73..84, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 78..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -124,11 +124,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, }, ), @@ -141,22 +141,22 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..112, subject: NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..95, }, ), cases: [ MatchCase { range: 101..112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 106..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -165,11 +165,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, }, ), @@ -182,11 +182,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..140, subject: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..123, value: true, }, @@ -194,11 +194,11 @@ Module( cases: [ MatchCase { range: 129..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 134..135, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -207,11 +207,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..140, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..140, }, ), @@ -224,11 +224,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..169, subject: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 147..152, value: false, }, @@ -236,11 +236,11 @@ Module( cases: [ MatchCase { range: 158..169, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 163..164, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -249,11 +249,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..169, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..169, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap index 849251e03e..71fa711fb7 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_classify_as_keyw ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..225, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, id: Name("match"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), arguments: Arguments { range: 6..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, value: Int( 1, @@ -41,7 +41,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..11, value: Int( 2, @@ -57,16 +57,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..67, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..39, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, value: Int( 1, @@ -75,7 +75,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, value: Int( 2, @@ -90,11 +90,11 @@ Module( cases: [ MatchCase { range: 56..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 61..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -103,11 +103,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..67, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..67, }, ), @@ -120,15 +120,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..78, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..78, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..73, id: Name("match"), ctx: Load, @@ -136,12 +136,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..77, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, value: Int( 1, @@ -160,16 +160,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..133, subject: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..105, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, value: Int( 1, @@ -178,7 +178,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..104, value: Int( 2, @@ -192,11 +192,11 @@ Module( cases: [ MatchCase { range: 122..133, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 127..128, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -205,11 +205,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..133, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..133, }, ), @@ -222,15 +222,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..145, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..145, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..139, id: Name("match"), ctx: Load, @@ -239,7 +239,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..145, id: Name("foo"), ctx: Load, @@ -251,15 +251,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..171, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..171, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..165, id: Name("match"), ctx: Load, @@ -268,7 +268,7 @@ Module( op: Sub, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..171, id: Name("foo"), ctx: Load, @@ -280,16 +280,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..224, subject: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..196, op: USub, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..196, id: Name("foo"), ctx: Load, @@ -300,11 +300,11 @@ Module( cases: [ MatchCase { range: 213..224, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 218..219, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -313,11 +313,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..224, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..224, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap index 7416b29f05..4abf3285a6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_sequence_pattern ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..57, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..56, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, id: Name("subject"), ctx: Load, @@ -25,22 +25,22 @@ Module( cases: [ MatchCase { range: 19..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 24..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 25..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 25..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -48,13 +48,13 @@ Module( MatchAs( PatternMatchAs { range: 28..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("b"), range: 28..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -66,11 +66,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..35, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..35, }, ), @@ -80,22 +80,22 @@ Module( }, MatchCase { range: 40..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 45..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 46..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 46..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -103,13 +103,13 @@ Module( MatchAs( PatternMatchAs { range: 49..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("b"), range: 49..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -121,11 +121,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap index 91f128eafc..d980cea8b2 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_sequence_pattern ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..95, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..94, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, id: Name("subject"), ctx: Load, @@ -25,17 +25,17 @@ Module( cases: [ MatchCase { range: 19..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -43,7 +43,7 @@ Module( guard: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("x"), ctx: Load, @@ -53,11 +53,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..35, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..35, }, ), @@ -67,22 +67,22 @@ Module( }, MatchCase { range: 40..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 45..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 45..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 45..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -90,13 +90,13 @@ Module( MatchAs( PatternMatchAs { range: 48..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("b"), range: 48..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -108,11 +108,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..54, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..54, }, ), @@ -122,22 +122,22 @@ Module( }, MatchCase { range: 59..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 64..68, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -145,13 +145,13 @@ Module( MatchAs( PatternMatchAs { range: 67..68, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("b"), range: 67..68, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -162,7 +162,7 @@ Module( guard: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("x"), ctx: Load, @@ -172,11 +172,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..78, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..78, }, ), @@ -186,17 +186,17 @@ Module( }, MatchCase { range: 83..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 88..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 88..89, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -205,11 +205,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..94, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..94, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap index e0042a2cc5..43db08647c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_stmt_subject_exp ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..185, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..29, subject: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..12, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Store, @@ -28,7 +28,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, value: Int( 1, @@ -40,11 +40,11 @@ Module( cases: [ MatchCase { range: 18..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 23..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -53,11 +53,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..29, }, ), @@ -70,15 +70,15 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..61, subject: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..43, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, id: Name("x"), ctx: Store, @@ -86,7 +86,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..43, value: Int( 1, @@ -98,11 +98,11 @@ Module( cases: [ MatchCase { range: 50..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 55..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -111,11 +111,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, }, ), @@ -128,24 +128,24 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..153, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..136, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..133, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..133, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, id: Name("x"), ctx: Load, @@ -154,7 +154,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, id: Name("y"), ctx: Load, @@ -167,7 +167,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, id: Name("z"), ctx: Load, @@ -181,11 +181,11 @@ Module( cases: [ MatchCase { range: 142..153, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 147..148, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -194,11 +194,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..153, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..153, }, ), @@ -211,15 +211,15 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..184, subject: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..167, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..167, id: Name("x"), ctx: Load, @@ -230,11 +230,11 @@ Module( cases: [ MatchCase { range: 173..184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 178..179, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -243,11 +243,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..184, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..184, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap index 32f6791cd4..ed559fabac 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/match_stmt_valid_guard ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..158, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..34, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -25,17 +25,17 @@ Module( cases: [ MatchCase { range: 13..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 18..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -43,11 +43,11 @@ Module( guard: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..29, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("a"), ctx: Store, @@ -55,7 +55,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, value: Int( 1, @@ -68,11 +68,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, }, ), @@ -85,11 +85,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..79, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..42, id: Name("x"), ctx: Load, @@ -98,17 +98,17 @@ Module( cases: [ MatchCase { range: 48..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -116,18 +116,18 @@ Module( guard: Some( If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..74, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..67, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..59, id: Name("a"), ctx: Load, @@ -135,7 +135,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..74, id: Name("b"), ctx: Load, @@ -147,11 +147,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..79, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..79, }, ), @@ -164,11 +164,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..119, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..87, id: Name("x"), ctx: Load, @@ -177,17 +177,17 @@ Module( cases: [ MatchCase { range: 93..119, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 98..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 98..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -195,26 +195,24 @@ Module( guard: Some( Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..114, parameters: Some( Parameters { range: 110..111, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 110..111, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 110..111, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 110..111, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -228,7 +226,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..114, id: Name("b"), ctx: Load, @@ -240,11 +238,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..119, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..119, }, ), @@ -257,11 +255,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..157, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..127, id: Name("x"), ctx: Load, @@ -270,17 +268,17 @@ Module( cases: [ MatchCase { range: 133..157, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 138..139, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 138..139, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -288,12 +286,12 @@ Module( guard: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..151, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..151, id: Name("x"), ctx: Load, @@ -306,11 +304,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..157, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..157, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap index b61390df0d..1f7090f2c9 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/multiple_assignment_in ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..42, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..41, subject: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, value: Int( 2, @@ -26,19 +26,19 @@ Module( cases: [ MatchCase { range: 13..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 18..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchClass( PatternMatchClass { range: 18..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..23, id: Name("Class"), ctx: Load, @@ -46,18 +46,18 @@ Module( ), arguments: PatternArguments { range: 23..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 24..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -70,18 +70,18 @@ Module( MatchSequence( PatternMatchSequence { range: 29..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 30..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 30..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -92,13 +92,13 @@ Module( MatchAs( PatternMatchAs { range: 35..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 35..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -110,11 +110,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..41, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..41, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap index b36ef0858e..9c269d6c69 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/nested_async_comprehen ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..181, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..116, is_async: true, decorator_list: [], name: Identifier { id: Name("f"), range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 55..57, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,15 +35,15 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..84, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..84, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..65, id: Name("_"), ctx: Load, @@ -54,10 +52,10 @@ Module( generators: [ Comprehension { range: 66..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, id: Name("n"), ctx: Store, @@ -65,11 +63,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..83, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..80, id: Name("range"), ctx: Load, @@ -77,11 +75,11 @@ Module( ), arguments: Arguments { range: 80..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, value: Int( 3, @@ -103,15 +101,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..116, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..116, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("_"), ctx: Load, @@ -120,10 +118,10 @@ Module( generators: [ Comprehension { range: 92..115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, id: Name("n"), ctx: Store, @@ -131,11 +129,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..115, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..112, id: Name("range"), ctx: Load, @@ -143,11 +141,11 @@ Module( ), arguments: Arguments { range: 112..115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..114, value: Int( 3, @@ -172,21 +170,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..180, is_async: true, decorator_list: [], name: Identifier { id: Name("f"), range: 127..128, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 128..130, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -197,21 +193,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..148, is_async: false, decorator_list: [], name: Identifier { id: Name("g"), range: 140..141, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 141..143, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -222,11 +216,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..148, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..148, }, ), @@ -237,15 +231,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..180, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..180, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..155, id: Name("_"), ctx: Load, @@ -254,10 +248,10 @@ Module( generators: [ Comprehension { range: 156..179, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..167, id: Name("n"), ctx: Store, @@ -265,11 +259,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..179, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..176, id: Name("range"), ctx: Load, @@ -277,11 +271,11 @@ Module( ), arguments: Arguments { range: 176..179, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..178, value: Int( 3, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap index 2a0a766dab..3754f5f1ba 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/nested_async_comprehen ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..277, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..111, is_async: true, decorator_list: [], name: Identifier { id: Name("f"), range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 55..57, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,20 +35,20 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..111, value: Some( ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..111, elt: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..92, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("x"), ctx: Load, @@ -59,10 +57,10 @@ Module( generators: [ Comprehension { range: 70..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..81, id: Name("x"), ctx: Store, @@ -70,11 +68,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..91, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, id: Name("foo"), ctx: Load, @@ -82,11 +80,11 @@ Module( ), arguments: Arguments { range: 88..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 89..90, id: Name("n"), ctx: Load, @@ -106,10 +104,10 @@ Module( generators: [ Comprehension { range: 93..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, id: Name("n"), ctx: Store, @@ -117,11 +115,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..110, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..107, id: Name("range"), ctx: Load, @@ -129,11 +127,11 @@ Module( ), arguments: Arguments { range: 107..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, value: Int( 3, @@ -159,21 +157,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..192, is_async: true, decorator_list: [], name: Identifier { id: Name("g"), range: 132..133, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 133..135, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -184,20 +180,20 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..192, value: Some( ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..192, elt: DictComp( ExprDictComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..173, key: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, id: Name("x"), ctx: Load, @@ -205,7 +201,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..150, value: Int( 1, @@ -215,10 +211,10 @@ Module( generators: [ Comprehension { range: 151..172, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 161..162, id: Name("x"), ctx: Store, @@ -226,11 +222,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..172, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..169, id: Name("foo"), ctx: Load, @@ -238,11 +234,11 @@ Module( ), arguments: Arguments { range: 169..172, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..171, id: Name("n"), ctx: Load, @@ -262,10 +258,10 @@ Module( generators: [ Comprehension { range: 174..191, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..179, id: Name("n"), ctx: Store, @@ -273,11 +269,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..191, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..188, id: Name("range"), ctx: Load, @@ -285,11 +281,11 @@ Module( ), arguments: Arguments { range: 188..191, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, value: Int( 3, @@ -315,21 +311,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..267, is_async: true, decorator_list: [], name: Identifier { id: Name("h"), range: 210..211, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 211..213, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -340,20 +334,20 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..267, value: Some( ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..267, elt: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 223..248, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..225, id: Name("x"), ctx: Load, @@ -362,10 +356,10 @@ Module( generators: [ Comprehension { range: 226..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..237, id: Name("x"), ctx: Store, @@ -373,11 +367,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..247, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..244, id: Name("foo"), ctx: Load, @@ -385,11 +379,11 @@ Module( ), arguments: Arguments { range: 244..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 245..246, id: Name("n"), ctx: Load, @@ -409,10 +403,10 @@ Module( generators: [ Comprehension { range: 249..266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..254, id: Name("n"), ctx: Store, @@ -420,11 +414,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..266, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..263, id: Name("range"), ctx: Load, @@ -432,11 +426,11 @@ Module( ), arguments: Arguments { range: 263..266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..265, value: Int( 3, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap index 76ed4f5937..c1a5fcb445 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/non_duplicate_type_par ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..150, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..23, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..10, id: Name("Alias"), ctx: Store, @@ -25,16 +25,16 @@ Module( type_params: Some( TypeParams { range: 10..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -45,11 +45,11 @@ Module( ), value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..23, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..20, id: Name("list"), ctx: Load, @@ -57,7 +57,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, id: Name("T"), ctx: Load, @@ -70,28 +70,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..43, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 28..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 29..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 30..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 30..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -102,26 +102,24 @@ Module( ), parameters: Parameters { range: 32..38, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 33..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 33..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("t"), range: 33..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, id: Name("T"), ctx: Load, @@ -140,11 +138,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..43, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..43, }, ), @@ -155,27 +153,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..59, decorator_list: [], name: Identifier { id: Name("C"), range: 50..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 51..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 52..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -188,11 +186,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..59, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..59, }, ), @@ -203,27 +201,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..81, decorator_list: [], name: Identifier { id: Name("C"), range: 66..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 67..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 68..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 68..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -232,11 +230,11 @@ Module( TypeVar( TypeParamTypeVar { range: 71..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("U"), range: 71..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -245,11 +243,11 @@ Module( TypeVar( TypeParamTypeVar { range: 74..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("V"), range: 74..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -262,11 +260,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..81, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..81, }, ), @@ -277,11 +275,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..149, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..92, id: Name("Alias"), ctx: Store, @@ -290,16 +288,16 @@ Module( type_params: Some( TypeParams { range: 92..143, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 93..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 93..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -308,16 +306,16 @@ Module( TypeVar( TypeParamTypeVar { range: 96..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("U"), range: 96..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..102, id: Name("str"), ctx: Load, @@ -330,21 +328,21 @@ Module( TypeVar( TypeParamTypeVar { range: 104..119, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("V"), range: 104..105, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..119, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..111, id: Name("str"), ctx: Load, @@ -352,7 +350,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..118, id: Name("bytes"), ctx: Load, @@ -370,11 +368,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 121..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 122..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -382,11 +380,11 @@ Module( ParamSpec( TypeParamParamSpec { range: 126..129, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 128..129, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -394,17 +392,17 @@ Module( TypeVar( TypeParamTypeVar { range: 131..142, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("D"), range: 131..132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..142, id: Name("default"), ctx: Load, @@ -418,7 +416,7 @@ Module( ), value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..149, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap index 3e80ba428d..32f31b1690 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/non_rebound_comprehens ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..27, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, value: ListComp( ExprListComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..26, elt: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..7, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..2, id: Name("a"), ctx: Store, @@ -32,7 +32,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, value: Int( 0, @@ -44,10 +44,10 @@ Module( generators: [ Comprehension { range: 8..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..13, id: Name("x"), ctx: Store, @@ -55,11 +55,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..25, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..22, id: Name("range"), ctx: Load, @@ -67,11 +67,11 @@ Module( ), arguments: Arguments { range: 22..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, value: Int( 0, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap index c3a1f13b03..f8015717e3 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/nonlocal_declaration_a ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..24, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..23, is_async: false, decorator_list: [], name: Identifier { id: Name("_"), range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 5..7, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,13 +35,13 @@ Module( body: [ Nonlocal( StmtNonlocal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..23, names: [ Identifier { id: Name("x"), range: 22..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap index 6ff8f3a685..da1fa3289e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/nonlocal_stmt.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..45, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..44, is_async: false, decorator_list: [], name: Identifier { id: Name("_"), range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 5..7, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,36 +35,36 @@ Module( body: [ Nonlocal( StmtNonlocal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..23, names: [ Identifier { id: Name("x"), range: 22..23, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, ), Nonlocal( StmtNonlocal { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..44, names: [ Identifier { id: Name("x"), range: 37..38, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, Identifier { id: Name("y"), range: 40..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, Identifier { id: Name("z"), range: 43..44, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ], }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap index c990da6f6e..07f19ba72a 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/other/atom.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..73, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3, }, ), @@ -24,11 +24,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..8, value: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..8, value: true, }, @@ -37,11 +37,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..14, value: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..14, value: false, }, @@ -50,11 +50,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..19, value: NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..19, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap index 4278651bd2..f90d87e8c7 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/other/decorator.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..407, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..40, is_async: false, decorator_list: [ Decorator { range: 0..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..19, id: Name("function_decorator"), ctx: Load, @@ -32,14 +32,12 @@ Module( name: Identifier { id: Name("test"), range: 24..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 28..30, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -50,7 +48,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..40, }, ), @@ -59,15 +57,15 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..80, decorator_list: [ Decorator { range: 43..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..59, id: Name("class_decorator"), ctx: Load, @@ -78,14 +76,14 @@ Module( name: Identifier { id: Name("Test"), range: 66..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..80, }, ), @@ -94,16 +92,16 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..106, is_async: false, decorator_list: [ Decorator { range: 83..93, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..93, id: Name("decorator"), ctx: Load, @@ -114,14 +112,12 @@ Module( name: Identifier { id: Name("f"), range: 98..99, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 99..101, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -132,11 +128,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..106, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..106, }, ), @@ -147,24 +143,24 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..128, is_async: false, decorator_list: [ Decorator { range: 109..115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..115, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..113, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 110..111, id: Name("a"), ctx: Load, @@ -173,7 +169,7 @@ Module( attr: Identifier { id: Name("b"), range: 112..113, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -181,7 +177,7 @@ Module( attr: Identifier { id: Name("c"), range: 114..115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -191,14 +187,12 @@ Module( name: Identifier { id: Name("f"), range: 120..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 121..123, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -209,11 +203,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..128, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..128, }, ), @@ -224,16 +218,16 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..153, is_async: false, decorator_list: [ Decorator { range: 131..133, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, id: Name("a"), ctx: Load, @@ -242,18 +236,18 @@ Module( }, Decorator { range: 134..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..140, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..138, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, id: Name("a"), ctx: Load, @@ -262,7 +256,7 @@ Module( attr: Identifier { id: Name("b"), range: 137..138, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -270,7 +264,7 @@ Module( attr: Identifier { id: Name("c"), range: 139..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -280,14 +274,12 @@ Module( name: Identifier { id: Name("f"), range: 145..146, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 146..148, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -298,11 +290,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..153, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 150..153, }, ), @@ -313,15 +305,15 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..185, decorator_list: [ Decorator { range: 156..158, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..158, id: Name("a"), ctx: Load, @@ -330,14 +322,14 @@ Module( }, Decorator { range: 159..165, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..165, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..161, value: Int( 1, @@ -347,7 +339,7 @@ Module( op: BitOr, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..165, value: Int( 2, @@ -359,18 +351,18 @@ Module( }, Decorator { range: 166..172, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..172, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..170, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 167..168, id: Name("a"), ctx: Load, @@ -379,7 +371,7 @@ Module( attr: Identifier { id: Name("b"), range: 169..170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -387,7 +379,7 @@ Module( attr: Identifier { id: Name("c"), range: 171..172, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -397,18 +389,18 @@ Module( name: Identifier { id: Name("T"), range: 179..180, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..185, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..185, }, ), @@ -419,20 +411,20 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 188..269, is_async: false, decorator_list: [ Decorator { range: 188..195, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..195, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, id: Name("x"), ctx: Store, @@ -440,7 +432,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..195, value: Int( 1, @@ -452,21 +444,21 @@ Module( }, Decorator { range: 196..213, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..213, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..206, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..198, id: Name("x"), ctx: Load, @@ -474,7 +466,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 212..213, id: Name("y"), ctx: Load, @@ -485,29 +477,27 @@ Module( }, Decorator { range: 214..226, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 215..226, parameters: Some( Parameters { range: 222..223, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 222..223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 222..223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 222..223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -521,7 +511,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..226, id: Name("x"), ctx: Load, @@ -532,16 +522,16 @@ Module( }, Decorator { range: 227..235, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..235, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..229, id: Name("x"), ctx: Load, @@ -549,7 +539,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..235, id: Name("y"), ctx: Load, @@ -561,15 +551,15 @@ Module( }, Decorator { range: 236..246, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..245, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 244..245, id: Name("x"), ctx: Load, @@ -581,19 +571,19 @@ Module( }, Decorator { range: 247..256, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 248..256, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 249..251, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 250..251, id: Name("x"), ctx: Load, @@ -604,11 +594,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 253..255, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..255, id: Name("y"), ctx: Load, @@ -627,14 +617,12 @@ Module( name: Identifier { id: Name("f"), range: 261..262, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 262..264, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -645,11 +633,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 266..269, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 266..269, }, ), @@ -660,20 +648,20 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 360..380, is_async: false, decorator_list: [ Decorator { range: 360..365, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 361..365, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 361..362, id: Name("x"), ctx: Load, @@ -682,7 +670,7 @@ Module( op: MatMult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..365, id: Name("y"), ctx: Load, @@ -695,14 +683,12 @@ Module( name: Identifier { id: Name("foo"), range: 370..373, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 373..375, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -713,11 +699,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 377..380, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 377..380, }, ), @@ -728,16 +714,16 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..407, is_async: false, decorator_list: [ Decorator { range: 383..385, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 384..385, id: Name("x"), ctx: Load, @@ -746,10 +732,10 @@ Module( }, Decorator { range: 388..390, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 389..390, id: Name("y"), ctx: Load, @@ -760,14 +746,12 @@ Module( name: Identifier { id: Name("foo"), range: 397..400, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 400..402, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -778,11 +762,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 404..407, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 404..407, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap index af944be2fb..03b7fab965 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap @@ -7,43 +7,41 @@ input_file: crates/ruff_python_parser/resources/inline/ok/param_with_annotation. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..54, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..22, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..17, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 8..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, id: Name("int"), ctx: Load, @@ -62,11 +60,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..22, }, ), @@ -77,57 +75,53 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..53, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 27..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 30..48, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 31..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 31..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 31..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..47, parameters: Some( Parameters { range: 43..44, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 43..44, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 43..44, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 43..44, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -141,7 +135,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, id: Name("x"), ctx: Load, @@ -162,11 +156,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..53, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..53, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap index 7951972b14..97ade21863 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap @@ -7,64 +7,60 @@ input_file: crates/ruff_python_parser/resources/inline/ok/param_with_default.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..111, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..27, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..22, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..21, parameters: Some( Parameters { range: 17..18, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -78,7 +74,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, id: Name("y"), ctx: Load, @@ -97,11 +93,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..27, }, ), @@ -112,51 +108,49 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..60, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 32..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 35..55, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 36..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 36..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 36..37, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..54, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..47, value: true, }, ), body: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, value: Int( 1, @@ -165,7 +159,7 @@ Module( ), orelse: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, value: Int( 2, @@ -185,11 +179,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, }, ), @@ -200,44 +194,42 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..84, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 65..68, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 68..79, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 69..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 69..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 69..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..78, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("y"), ctx: Load, @@ -256,11 +248,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, }, ), @@ -271,45 +263,43 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..110, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 89..92, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 92..105, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 93..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 93..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 93..94, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..103, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, id: Name("y"), ctx: Load, @@ -329,11 +319,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..110, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..110, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap index a9987458b0..6a3c7ccc9c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap @@ -7,49 +7,47 @@ input_file: crates/ruff_python_parser/resources/inline/ok/param_with_star_annota ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..67, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..31, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..26, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 8..25, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 9..13, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..25, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..25, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..19, id: Name("int"), ctx: Load, @@ -58,7 +56,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, id: Name("str"), ctx: Load, @@ -79,11 +77,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..31, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..31, }, ), @@ -94,46 +92,44 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..66, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 36..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 39..61, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 40..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 41..45, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..60, value: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..59, op: Or, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, id: Name("int"), ctx: Load, @@ -141,7 +137,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..59, id: Name("str"), ctx: Load, @@ -163,11 +159,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..66, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..66, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap index 8e1d5b24be..d411155da7 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap @@ -7,38 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/ok/param_with_star_annota ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..432, body: [ ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..206, module: Some( Identifier { id: Name("typing"), range: 174..180, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 188..197, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Annotated"), range: 188..197, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 199..206, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Literal"), range: 199..206, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -48,36 +48,34 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..230, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 211..214, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 214..225, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 215..224, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 216..220, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..224, id: Name("Ts"), ctx: Load, @@ -93,11 +91,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..230, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..230, }, ), @@ -108,40 +106,38 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..295, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 235..238, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 238..290, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 239..289, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 240..241, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 243..289, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 243..250, id: Name("Literal"), ctx: Load, @@ -149,13 +145,13 @@ Module( ), slice: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 251..288, value: StringLiteralValue { inner: Single( StringLiteral { range: 251..288, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "this should allow arbitrary strings", flags: StringLiteralFlags { quote_style: Double, @@ -180,11 +176,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 292..295, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 292..295, }, ), @@ -195,40 +191,38 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 296..367, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 300..303, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 303..362, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 304..361, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 305..306, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 308..361, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 308..317, id: Name("Annotated"), ctx: Load, @@ -236,12 +230,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 318..360, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 318..321, id: Name("str"), ctx: Load, @@ -249,13 +243,13 @@ Module( ), StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 323..360, value: StringLiteralValue { inner: Single( StringLiteral { range: 323..360, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "this should allow arbitrary strings", flags: StringLiteralFlags { quote_style: Double, @@ -285,11 +279,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..367, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..367, }, ), @@ -300,36 +294,34 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 368..405, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 372..375, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 375..400, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 376..386, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 377..381, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..386, id: Name("str"), ctx: Load, @@ -342,16 +334,16 @@ Module( kwarg: Some( Parameter { range: 388..399, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwds"), range: 390..394, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 396..399, id: Name("int"), ctx: Load, @@ -365,11 +357,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 402..405, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 402..405, }, ), @@ -380,40 +372,38 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 406..431, is_async: false, decorator_list: [], name: Identifier { id: Name("union"), range: 410..415, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 415..426, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 416..425, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 417..418, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 420..425, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 420..421, id: Name("A"), ctx: Load, @@ -422,7 +412,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 424..425, id: Name("B"), ctx: Load, @@ -440,11 +430,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 428..431, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 428..431, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap index 0f1eed04f9..0853afb16c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap @@ -7,45 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/ok/param_with_star_annota ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..69, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..68, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 48..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 51..63, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 52..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 53..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..62, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..62, id: Name("Ts"), ctx: Load, @@ -64,11 +62,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..68, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..68, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap index 2a4bdc6a75..fba5d8d3ec 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap @@ -7,45 +7,43 @@ input_file: crates/ruff_python_parser/resources/inline/ok/params_non_default_aft ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..72, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..33, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..28, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 8..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 8..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..12, value: Int( 10, @@ -59,14 +57,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 17..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -74,21 +72,21 @@ Module( }, ParameterWithDefault { range: 20..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 20..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 20..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..24, value: Int( 11, @@ -99,14 +97,14 @@ Module( }, ParameterWithDefault { range: 26..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 26..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 26..27, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -119,11 +117,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..33, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..33, }, ), @@ -134,40 +132,38 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..71, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 38..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 41..66, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 42..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 42..43, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..46, value: Int( 10, @@ -180,11 +176,11 @@ Module( vararg: Some( Parameter { range: 48..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 49..53, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -192,14 +188,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 55..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 55..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 55..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -207,21 +203,21 @@ Module( }, ParameterWithDefault { range: 58..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 58..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 58..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..62, value: Int( 11, @@ -232,14 +228,14 @@ Module( }, ParameterWithDefault { range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -252,11 +248,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..71, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..71, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap index 458f38d329..7559480388 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap @@ -7,40 +7,38 @@ input_file: crates/ruff_python_parser/resources/inline/ok/params_seen_keyword_on ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..61, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 4..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 7..23, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, kwonlyargs: [ ParameterWithDefault { range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 11..12, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -50,11 +48,11 @@ Module( kwarg: Some( Parameter { range: 14..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 16..22, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -64,11 +62,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, }, ), @@ -79,42 +77,40 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..60, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 33..36, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 36..55, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, kwonlyargs: [ ParameterWithDefault { range: 40..44, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 40..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 40..41, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..44, value: Int( 10, @@ -127,11 +123,11 @@ Module( kwarg: Some( Parameter { range: 46..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 48..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -141,11 +137,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap index b8b9b08747..9d627ba68f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/parenthesized_context_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..126, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..73, is_async: false, items: [ WithItem { range: 49..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, id: Name("foo"), ctx: Load, @@ -30,7 +30,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("x"), ctx: Store, @@ -40,10 +40,10 @@ Module( }, WithItem { range: 59..67, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..62, id: Name("bar"), ctx: Load, @@ -52,7 +52,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, id: Name("y"), ctx: Store, @@ -64,11 +64,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..73, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..73, }, ), @@ -79,16 +79,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..99, is_async: false, items: [ WithItem { range: 80..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..83, id: Name("foo"), ctx: Load, @@ -98,10 +98,10 @@ Module( }, WithItem { range: 85..93, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, id: Name("bar"), ctx: Load, @@ -110,7 +110,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..93, id: Name("y"), ctx: Store, @@ -122,11 +122,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..99, }, ), @@ -137,16 +137,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..125, is_async: false, items: [ WithItem { range: 106..114, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..109, id: Name("foo"), ctx: Load, @@ -155,7 +155,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..114, id: Name("x"), ctx: Store, @@ -165,10 +165,10 @@ Module( }, WithItem { range: 116..119, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..119, id: Name("bar"), ctx: Load, @@ -180,11 +180,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..125, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..125, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap index 15feb12d38..91e6d3ec22 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/parenthesized_kwarg_py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..52, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..51, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..51, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, id: Name("f"), ctx: Load, @@ -28,22 +28,22 @@ Module( ), arguments: Arguments { range: 44..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 45..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("a"), range: 46..47, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap index b5b5b300e5..a422908b73 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/parenthesized_named_ex ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..55, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..54, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..54, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..46, id: Name("lst"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), slice: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..52, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..49, id: Name("x"), ctx: Store, @@ -40,7 +40,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap index c1f65ffc1d..1f14d31def 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap @@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/ok/parenthesized_named_ex ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..92, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..59, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..59, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..51, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..46, id: Name("x"), ctx: Store, @@ -33,7 +33,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..51, value: Int( 1, @@ -44,7 +44,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, value: Int( 2, @@ -53,7 +53,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, value: Int( 3, @@ -67,19 +67,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..91, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..91, elt: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..71, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..66, id: Name("last"), ctx: Store, @@ -87,7 +87,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, id: Name("x"), ctx: Load, @@ -98,10 +98,10 @@ Module( generators: [ Comprehension { range: 73..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..78, id: Name("x"), ctx: Store, @@ -109,11 +109,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..90, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..87, id: Name("range"), ctx: Load, @@ -121,11 +121,11 @@ Module( ), arguments: Arguments { range: 87..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..89, value: Int( 3, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap index a1f2cd011d..cfae3dd052 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/inline/ok/parenthesized_star_ind ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..94, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..93, targets: [ Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..89, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..47, id: Name("out"), ctx: Load, @@ -29,24 +29,24 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..88, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..81, value: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..81, elt: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..62, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..56, id: Name("slice"), ctx: Load, @@ -54,11 +54,11 @@ Module( ), arguments: Arguments { range: 56..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..61, }, ), @@ -70,10 +70,10 @@ Module( generators: [ Comprehension { range: 63..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..68, id: Name("_"), ctx: Store, @@ -81,11 +81,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..80, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..77, id: Name("range"), ctx: Load, @@ -93,11 +93,11 @@ Module( ), arguments: Arguments { range: 77..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, value: Int( 2, @@ -121,11 +121,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..87, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..87, id: Name("ind"), ctx: Load, @@ -145,7 +145,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..93, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap index 6f728ba6da..581693aa41 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap @@ -7,44 +7,44 @@ input_file: crates/ruff_python_parser/resources/inline/ok/pep701_f_string_py311. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..278, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..72, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..72, value: FStringValue { inner: Single( FString( FString { range: 44..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 46..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "outer ", }, ), Interpolation( InterpolatedElement { range: 52..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..70, value: StringLiteralValue { inner: Single( StringLiteral { range: 53..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "# not a comment", flags: StringLiteralFlags { quote_style: Single, @@ -77,33 +77,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..106, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..106, value: FStringValue { inner: Single( FString( FString { range: 73..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 75..81, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "outer ", }, ), Interpolation( InterpolatedElement { range: 81..105, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, id: Name("x"), ctx: Load, @@ -114,21 +114,21 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 84..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 84..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..102, value: StringLiteralValue { inner: Single( StringLiteral { range: 85..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "# not a comment", flags: StringLiteralFlags { quote_style: Double, @@ -148,7 +148,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 103..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " ", }, ), @@ -173,62 +173,62 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..147, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..147, value: FStringValue { inner: Single( FString( FString { range: 107..147, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 111..144, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..143, value: FStringValue { inner: Single( FString( FString { range: 112..143, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 116..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..139, value: FStringValue { inner: Single( FString( FString { range: 117..139, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 119..138, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..137, value: StringLiteralValue { inner: Single( StringLiteral { range: 120..137, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "# not a comment", flags: StringLiteralFlags { quote_style: Double, @@ -295,96 +295,96 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..230, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..230, value: FStringValue { inner: Single( FString( FString { range: 148..230, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 152..208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..207, value: FStringValue { inner: Single( FString( FString { range: 153..207, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 157..177, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "# before expression ", }, ), Interpolation( InterpolatedElement { range: 177..204, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..203, value: FStringValue { inner: Single( FString( FString { range: 178..203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 180..185, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "# aro", }, ), Interpolation( InterpolatedElement { range: 185..197, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..196, value: FStringValue { inner: Single( FString( FString { range: 186..196, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 188..189, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "#", }, ), Interpolation( InterpolatedElement { range: 189..194, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..193, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..191, value: Int( 1, @@ -394,7 +394,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..193, value: Int( 1, @@ -411,7 +411,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 194..195, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "#", }, ), @@ -435,7 +435,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 197..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "und #", }, ), @@ -476,7 +476,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 208..227, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " # after expression", }, ), @@ -496,33 +496,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..263, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..263, value: FStringValue { inner: Single( FString( FString { range: 231..263, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 233..254, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "escape outside of \t ", }, ), Interpolation( InterpolatedElement { range: 254..260, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..259, id: Name("expr"), ctx: Load, @@ -536,7 +536,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 260..262, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\n", }, ), @@ -556,23 +556,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..277, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..277, value: FStringValue { inner: Single( FString( FString { range: 264..277, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 266..276, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "test\"abcd", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap index aad89368d1..6fb97c216e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap @@ -7,42 +7,42 @@ input_file: crates/ruff_python_parser/resources/inline/ok/pep701_f_string_py312. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..403, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..74, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..74, value: FStringValue { inner: Single( FString( FString { range: 44..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 46..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Magic wand: ", }, ), Interpolation( InterpolatedElement { range: 58..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..71, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, id: Name("bag"), ctx: Load, @@ -50,13 +50,13 @@ Module( ), slice: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..70, value: StringLiteralValue { inner: Single( StringLiteral { range: 64..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "wand", flags: StringLiteralFlags { quote_style: Single, @@ -92,40 +92,40 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..112, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..112, value: FStringValue { inner: Single( FString( FString { range: 95..112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 97..111, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..110, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..107, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..102, value: StringLiteralValue { inner: Single( StringLiteral { range: 98..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\n", flags: StringLiteralFlags { quote_style: Single, @@ -140,18 +140,18 @@ Module( attr: Identifier { id: Name("join"), range: 103..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 107..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, id: Name("a"), ctx: Load, @@ -183,37 +183,37 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..220, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..220, value: FStringValue { inner: Single( FString( FString { range: 148..220, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 152..169, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "A complex trick: ", }, ), Interpolation( InterpolatedElement { range: 169..217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..185, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..178, id: Name("bag"), ctx: Load, @@ -221,13 +221,13 @@ Module( ), slice: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..184, value: StringLiteralValue { inner: Single( StringLiteral { range: 179..184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "bag", flags: StringLiteralFlags { quote_style: Single, @@ -263,105 +263,105 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..254, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..254, value: FStringValue { inner: Single( FString( FString { range: 221..254, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 223..253, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..252, value: FStringValue { inner: Single( FString( FString { range: 224..252, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 226..251, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..250, value: FStringValue { inner: Single( FString( FString { range: 227..250, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 229..249, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..248, value: FStringValue { inner: Single( FString( FString { range: 230..248, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 232..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..246, value: FStringValue { inner: Single( FString( FString { range: 233..246, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 235..245, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..244, value: FStringValue { inner: Single( FString( FString { range: 236..244, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 238..243, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..242, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..240, value: Int( 1, @@ -371,7 +371,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..242, value: Int( 1, @@ -486,47 +486,47 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 276..310, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 276..310, value: FStringValue { inner: Single( FString( FString { range: 276..310, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 278..303, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 279..302, value: FStringValue { inner: Single( FString( FString { range: 279..302, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 283..293, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 284..292, value: StringLiteralValue { inner: Single( StringLiteral { range: 284..292, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "nested", flags: StringLiteralFlags { quote_style: Double, @@ -546,7 +546,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 293..299, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " inner", }, ), @@ -570,7 +570,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 303..309, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " outer", }, ), @@ -590,33 +590,33 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..359, value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..359, value: FStringValue { inner: Single( FString( FString { range: 336..359, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 338..343, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "test ", }, ), Interpolation( InterpolatedElement { range: 343..353, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..345, id: Name("a"), ctx: Load, @@ -630,7 +630,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 353..358, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " more", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap index 217b66b09c..6c656364a8 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap @@ -7,41 +7,41 @@ input_file: crates/ruff_python_parser/resources/inline/ok/pep750_t_string_py314. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..403, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..74, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..74, value: TStringValue { inner: Single( TString { range: 44..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 46..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Magic wand: ", }, ), Interpolation( InterpolatedElement { range: 58..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..71, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..63, id: Name("bag"), ctx: Load, @@ -49,13 +49,13 @@ Module( ), slice: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..70, value: StringLiteralValue { inner: Single( StringLiteral { range: 64..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "wand", flags: StringLiteralFlags { quote_style: Single, @@ -90,39 +90,39 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..112, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..112, value: TStringValue { inner: Single( TString { range: 95..112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 97..111, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..110, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..107, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..102, value: StringLiteralValue { inner: Single( StringLiteral { range: 98..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "\n", flags: StringLiteralFlags { quote_style: Single, @@ -137,18 +137,18 @@ Module( attr: Identifier { id: Name("join"), range: 103..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 107..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, id: Name("a"), ctx: Load, @@ -179,36 +179,36 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..220, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..220, value: TStringValue { inner: Single( TString { range: 148..220, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 152..169, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "A complex trick: ", }, ), Interpolation( InterpolatedElement { range: 169..217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..185, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 175..178, id: Name("bag"), ctx: Load, @@ -216,13 +216,13 @@ Module( ), slice: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..184, value: StringLiteralValue { inner: Single( StringLiteral { range: 179..184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "bag", flags: StringLiteralFlags { quote_style: Single, @@ -257,99 +257,99 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..254, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..254, value: TStringValue { inner: Single( TString { range: 221..254, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 223..253, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..252, value: TStringValue { inner: Single( TString { range: 224..252, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 226..251, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..250, value: TStringValue { inner: Single( TString { range: 227..250, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 229..249, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..248, value: TStringValue { inner: Single( TString { range: 230..248, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 232..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..246, value: TStringValue { inner: Single( TString { range: 233..246, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 235..245, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..244, value: TStringValue { inner: Single( TString { range: 236..244, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 238..243, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..242, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..240, value: Int( 1, @@ -359,7 +359,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..242, value: Int( 1, @@ -468,45 +468,45 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 276..310, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 276..310, value: TStringValue { inner: Single( TString { range: 276..310, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 278..303, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 279..302, value: TStringValue { inner: Single( TString { range: 279..302, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 283..293, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 284..292, value: StringLiteralValue { inner: Single( StringLiteral { range: 284..292, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "nested", flags: StringLiteralFlags { quote_style: Double, @@ -526,7 +526,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 293..299, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " inner", }, ), @@ -549,7 +549,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 303..309, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " outer", }, ), @@ -568,32 +568,32 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..359, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..359, value: TStringValue { inner: Single( TString { range: 336..359, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 338..343, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "test ", }, ), Interpolation( InterpolatedElement { range: 343..353, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..345, id: Name("a"), ctx: Load, @@ -607,7 +607,7 @@ Module( Literal( InterpolatedStringLiteralElement { range: 353..358, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " more", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap index 69b218e419..fbf17fc861 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap @@ -7,37 +7,35 @@ input_file: crates/ruff_python_parser/resources/inline/ok/pos_only_py38.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..62, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..61, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 47..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 50..56, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 51..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 51..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 51..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -53,11 +51,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap index 7d3b052d80..993a3512aa 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/read_from_debug.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..32, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..12, id: Name("__debug__"), ctx: Load, @@ -25,11 +25,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, }, ), @@ -41,12 +41,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..31, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("x"), ctx: Store, @@ -55,7 +55,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..31, id: Name("__debug__"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap index 46c8be7e44..6dbd6b9fbf 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/simple_stmts_in_block. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..84, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..7, value: true, }, @@ -24,7 +24,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..13, }, ), @@ -34,11 +34,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..27, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..21, value: true, }, @@ -46,7 +46,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..27, }, ), @@ -56,11 +56,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..52, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..36, value: true, }, @@ -68,13 +68,13 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..42, }, ), Continue( StmtContinue { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..52, }, ), @@ -84,11 +84,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..76, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..60, value: true, }, @@ -96,13 +96,13 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..66, }, ), Continue( StmtContinue { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..76, }, ), @@ -112,12 +112,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..83, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..79, id: Name("x"), ctx: Store, @@ -126,7 +126,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap index 41be29071f..0f302ff4d1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap @@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/inline/ok/simple_stmts_with_semi ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..51, body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, value: None, }, ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..16, names: [ Alias { range: 15..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 15..16, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -37,23 +37,23 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..33, module: Some( Identifier { id: Name("x"), range: 23..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 32..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 32..33, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -63,11 +63,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("z"), ctx: Load, @@ -77,11 +77,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..50, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, id: Name("T"), ctx: Store, @@ -90,7 +90,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..50, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap index 4c44c9cbb3..ca0b875086 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/single_star_in_tuple.p ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..84, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..20, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 4..5, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 5..7, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,25 +35,25 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..20, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..20, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..20, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..18, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..18, id: Name("x"), ctx: Load, @@ -79,21 +77,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..42, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 25..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 26..28, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -104,21 +100,21 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..42, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..42, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..40, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("x"), ctx: Load, @@ -140,12 +136,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..62, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("_"), ctx: Store, @@ -153,16 +149,16 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..57, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..55, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..55, id: Name("x"), ctx: Load, @@ -179,11 +175,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..62, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..62, }, ), @@ -195,21 +191,21 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..83, is_async: false, target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..72, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..70, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..70, id: Name("x"), ctx: Store, @@ -225,7 +221,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..78, id: Name("xs"), ctx: Load, @@ -234,11 +230,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..83, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..83, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap index b202252533..05dfde51fa 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap @@ -7,26 +7,26 @@ input_file: crates/ruff_python_parser/resources/inline/ok/single_starred_assignm ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..36, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, targets: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1..3, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2..3, id: Name("a"), ctx: Store, @@ -43,12 +43,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..12, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..10, value: Int( 1, @@ -64,21 +64,21 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..23, targets: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..15, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("a"), ctx: Store, @@ -95,12 +95,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..23, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..21, value: Int( 1, @@ -116,21 +116,21 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..35, targets: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..28, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..27, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("a"), ctx: Store, @@ -146,12 +146,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..35, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap index daf54439c2..562a74ae6d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/star_index_py311.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..293, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..55, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..55, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..47, id: Name("lst"), ctx: Load, @@ -28,16 +28,16 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..54, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..54, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..54, id: Name("index"), ctx: Load, @@ -58,27 +58,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..112, decorator_list: [], name: Identifier { id: Name("Array"), range: 78..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 83..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..106, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..91, id: Name("Generic"), ctx: Load, @@ -86,12 +86,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..105, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..97, id: Name("DType"), ctx: Load, @@ -99,11 +99,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..105, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..105, id: Name("Shape"), ctx: Load, @@ -127,11 +127,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, }, ), @@ -142,15 +142,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..161, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..161, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..151, id: Name("lst"), ctx: Load, @@ -158,12 +158,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..160, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..153, id: Name("a"), ctx: Load, @@ -171,11 +171,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..157, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..157, id: Name("b"), ctx: Load, @@ -186,7 +186,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..160, id: Name("c"), ctx: Load, @@ -204,15 +204,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..198, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..198, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..188, id: Name("lst"), ctx: Load, @@ -220,12 +220,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..197, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, id: Name("a"), ctx: Load, @@ -233,7 +233,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..193, id: Name("b"), ctx: Load, @@ -241,11 +241,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 195..197, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..197, id: Name("c"), ctx: Load, @@ -266,15 +266,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..233, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..233, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..225, id: Name("lst"), ctx: Load, @@ -282,16 +282,16 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..232, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..228, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..228, id: Name("a"), ctx: Load, @@ -302,11 +302,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..232, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..232, id: Name("b"), ctx: Load, @@ -327,15 +327,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..271, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..271, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..259, id: Name("array"), ctx: Load, @@ -343,17 +343,17 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..270, elts: [ Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..263, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..261, value: Int( 3, @@ -364,7 +364,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 262..263, value: Int( 5, @@ -377,11 +377,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..270, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 266..270, id: Name("idxs"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap index df0e3f80ed..8e048cdfb7 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/statement/ambiguous_lpar_w ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..3620, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 588..604, is_async: false, items: [ WithItem { range: 594..598, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 594..598, id: Name("item"), ctx: Load, @@ -33,11 +33,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 601..604, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 601..604, }, ), @@ -48,16 +48,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 605..622, is_async: false, items: [ WithItem { range: 611..615, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 611..615, id: Name("item"), ctx: Load, @@ -69,11 +69,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 619..622, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 619..622, }, ), @@ -84,16 +84,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 648..668, is_async: false, items: [ WithItem { range: 654..662, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 656..660, id: Name("item"), ctx: Load, @@ -105,11 +105,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 665..668, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 665..668, }, ), @@ -120,16 +120,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 669..693, is_async: false, items: [ WithItem { range: 675..680, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 675..680, id: Name("item1"), ctx: Load, @@ -139,10 +139,10 @@ Module( }, WithItem { range: 682..687, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 682..687, id: Name("item2"), ctx: Load, @@ -154,11 +154,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 690..693, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 690..693, }, ), @@ -169,16 +169,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 694..719, is_async: false, items: [ WithItem { range: 700..705, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 700..705, id: Name("item1"), ctx: Load, @@ -188,10 +188,10 @@ Module( }, WithItem { range: 707..712, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 707..712, id: Name("item2"), ctx: Load, @@ -203,11 +203,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 716..719, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 716..719, }, ), @@ -218,16 +218,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 745..794, is_async: false, items: [ WithItem { range: 751..758, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 752..757, id: Name("item1"), ctx: Load, @@ -237,10 +237,10 @@ Module( }, WithItem { range: 760..767, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 761..766, id: Name("item2"), ctx: Load, @@ -250,10 +250,10 @@ Module( }, WithItem { range: 769..779, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 769..774, id: Name("item3"), ctx: Load, @@ -262,7 +262,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 778..779, id: Name("f"), ctx: Store, @@ -272,10 +272,10 @@ Module( }, WithItem { range: 781..788, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 782..787, id: Name("item4"), ctx: Load, @@ -287,11 +287,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 791..794, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 791..794, }, ), @@ -302,21 +302,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 795..828, is_async: false, items: [ WithItem { range: 801..815, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 801..815, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 802..807, id: Name("item1"), ctx: Load, @@ -324,7 +324,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 809..814, id: Name("item2"), ctx: Load, @@ -339,10 +339,10 @@ Module( }, WithItem { range: 817..822, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 817..822, id: Name("item3"), ctx: Load, @@ -354,11 +354,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 825..828, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 825..828, }, ), @@ -369,21 +369,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 829..852, is_async: false, items: [ WithItem { range: 835..846, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 835..841, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 836..837, id: Name("x"), ctx: Load, @@ -391,7 +391,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 839..840, id: Name("y"), ctx: Load, @@ -405,7 +405,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 845..846, id: Name("f"), ctx: Store, @@ -417,11 +417,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 849..852, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 849..852, }, ), @@ -432,16 +432,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 853..889, is_async: false, items: [ WithItem { range: 859..870, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 859..864, id: Name("item1"), ctx: Load, @@ -450,7 +450,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 868..870, id: Name("f1"), ctx: Store, @@ -460,10 +460,10 @@ Module( }, WithItem { range: 872..883, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 872..877, id: Name("item2"), ctx: Load, @@ -472,7 +472,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 881..883, id: Name("f2"), ctx: Store, @@ -484,11 +484,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 886..889, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 886..889, }, ), @@ -499,16 +499,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 890..927, is_async: false, items: [ WithItem { range: 896..907, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 896..901, id: Name("item1"), ctx: Load, @@ -517,7 +517,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 905..907, id: Name("f1"), ctx: Store, @@ -527,10 +527,10 @@ Module( }, WithItem { range: 909..920, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 909..914, id: Name("item2"), ctx: Load, @@ -539,7 +539,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 918..920, id: Name("f2"), ctx: Store, @@ -551,11 +551,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 924..927, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 924..927, }, ), @@ -566,20 +566,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 953..976, is_async: false, items: [ WithItem { range: 959..969, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 959..969, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 959..963, id: Name("item"), ctx: Load, @@ -591,7 +591,7 @@ Module( comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 967..969, value: Int( 10, @@ -607,11 +607,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 973..976, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 973..976, }, ), @@ -622,20 +622,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 977..1001, is_async: false, items: [ WithItem { range: 983..995, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 984..994, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 984..988, id: Name("item"), ctx: Store, @@ -643,7 +643,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 992..994, value: Int( 10, @@ -658,11 +658,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 998..1001, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 998..1001, }, ), @@ -673,25 +673,25 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1002..1027, is_async: false, items: [ WithItem { range: 1008..1021, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1008..1021, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1009..1019, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1009..1013, id: Name("item"), ctx: Store, @@ -699,7 +699,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1017..1019, value: Int( 10, @@ -719,11 +719,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1024..1027, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1024..1027, }, ), @@ -734,25 +734,25 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1028..1048, is_async: false, items: [ WithItem { range: 1034..1042, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1034..1042, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1035..1040, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1036..1040, id: Name("item"), ctx: Load, @@ -772,11 +772,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1045..1048, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1045..1048, }, ), @@ -787,20 +787,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1049..1081, is_async: false, items: [ WithItem { range: 1055..1068, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1056..1067, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1056..1061, id: Name("item1"), ctx: Store, @@ -808,7 +808,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1065..1067, value: Int( 10, @@ -821,10 +821,10 @@ Module( }, WithItem { range: 1070..1075, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1070..1075, id: Name("item2"), ctx: Load, @@ -836,11 +836,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1078..1081, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1078..1081, }, ), @@ -851,16 +851,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1082..1119, is_async: false, items: [ WithItem { range: 1088..1098, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1088..1093, id: Name("item1"), ctx: Load, @@ -869,7 +869,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1097..1098, id: Name("f"), ctx: Store, @@ -879,14 +879,14 @@ Module( }, WithItem { range: 1100..1113, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1101..1112, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1101..1106, id: Name("item2"), ctx: Store, @@ -894,7 +894,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1110..1112, value: Int( 10, @@ -909,11 +909,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1116..1119, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1116..1119, }, ), @@ -924,20 +924,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1120..1137, is_async: false, items: [ WithItem { range: 1126..1131, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1126..1131, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1126..1129, id: Name("foo"), ctx: Load, @@ -945,7 +945,7 @@ Module( ), arguments: Arguments { range: 1129..1131, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -957,11 +957,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1134..1137, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1134..1137, }, ), @@ -972,20 +972,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1138..1156, is_async: false, items: [ WithItem { range: 1144..1149, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1144..1149, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1144..1147, id: Name("foo"), ctx: Load, @@ -993,7 +993,7 @@ Module( ), arguments: Arguments { range: 1147..1149, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1005,11 +1005,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1153..1156, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1153..1156, }, ), @@ -1020,20 +1020,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1157..1179, is_async: false, items: [ WithItem { range: 1163..1173, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1163..1168, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1163..1166, id: Name("foo"), ctx: Load, @@ -1041,7 +1041,7 @@ Module( ), arguments: Arguments { range: 1166..1168, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1050,7 +1050,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1172..1173, id: Name("f"), ctx: Store, @@ -1062,11 +1062,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1176..1179, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1176..1179, }, ), @@ -1077,31 +1077,31 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1180..1207, is_async: false, items: [ WithItem { range: 1186..1201, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1186..1201, value: FStringValue { inner: Single( FString( FString { range: 1186..1201, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 1188..1200, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1189..1193, id: Name("item"), ctx: Load, @@ -1112,12 +1112,12 @@ Module( format_spec: Some( InterpolatedStringFormatSpec { range: 1195..1199, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 1195..1199, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "= 42", }, ), @@ -1144,11 +1144,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1204..1207, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1204..1207, }, ), @@ -1159,35 +1159,35 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1208..1237, is_async: false, items: [ WithItem { range: 1214..1231, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1214..1231, value: FStringValue { inner: Single( FString( FString { range: 1214..1231, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 1216..1230, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1218..1228, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1218..1222, id: Name("item"), ctx: Store, @@ -1195,7 +1195,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1226..1228, value: Int( 42, @@ -1227,11 +1227,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1234..1237, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1234..1237, }, ), @@ -1242,20 +1242,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1238..1278, is_async: false, items: [ WithItem { range: 1244..1266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1244..1266, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1245..1246, id: Name("x"), ctx: Load, @@ -1264,10 +1264,10 @@ Module( generators: [ Comprehension { range: 1247..1265, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1251..1252, id: Name("x"), ctx: Store, @@ -1275,11 +1275,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1256..1265, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1256..1261, id: Name("range"), ctx: Load, @@ -1287,11 +1287,11 @@ Module( ), arguments: Arguments { range: 1261..1265, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1262..1264, value: Int( 10, @@ -1314,10 +1314,10 @@ Module( }, WithItem { range: 1268..1272, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1268..1272, id: Name("item"), ctx: Load, @@ -1329,11 +1329,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1275..1278, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1275..1278, }, ), @@ -1344,16 +1344,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1279..1319, is_async: false, items: [ WithItem { range: 1285..1289, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1285..1289, id: Name("item"), ctx: Load, @@ -1363,14 +1363,14 @@ Module( }, WithItem { range: 1291..1313, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1291..1313, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1292..1293, id: Name("x"), ctx: Load, @@ -1379,10 +1379,10 @@ Module( generators: [ Comprehension { range: 1294..1312, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1298..1299, id: Name("x"), ctx: Store, @@ -1390,11 +1390,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1303..1312, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1303..1308, id: Name("range"), ctx: Load, @@ -1402,11 +1402,11 @@ Module( ), arguments: Arguments { range: 1308..1312, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1309..1311, value: Int( 10, @@ -1431,11 +1431,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1316..1319, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1316..1319, }, ), @@ -1446,16 +1446,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1320..1366, is_async: false, items: [ WithItem { range: 1326..1330, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1326..1330, id: Name("item"), ctx: Load, @@ -1465,14 +1465,14 @@ Module( }, WithItem { range: 1332..1354, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1332..1354, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1333..1334, id: Name("x"), ctx: Load, @@ -1481,10 +1481,10 @@ Module( generators: [ Comprehension { range: 1335..1353, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1339..1340, id: Name("x"), ctx: Store, @@ -1492,11 +1492,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1344..1353, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1344..1349, id: Name("range"), ctx: Load, @@ -1504,11 +1504,11 @@ Module( ), arguments: Arguments { range: 1349..1353, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1350..1352, value: Int( 10, @@ -1531,10 +1531,10 @@ Module( }, WithItem { range: 1356..1360, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1356..1360, id: Name("item"), ctx: Load, @@ -1546,11 +1546,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1363..1366, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1363..1366, }, ), @@ -1561,20 +1561,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1367..1388, is_async: false, items: [ WithItem { range: 1373..1382, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1373..1382, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1373..1377, id: Name("data"), ctx: Load, @@ -1582,12 +1582,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1378..1381, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1378..1379, value: Int( 1, @@ -1598,7 +1598,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1380..1381, value: Int( 2, @@ -1618,11 +1618,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1385..1388, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1385..1388, }, ), @@ -1633,20 +1633,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1389..1415, is_async: false, items: [ WithItem { range: 1395..1409, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1395..1404, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1395..1399, id: Name("data"), ctx: Load, @@ -1654,12 +1654,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1400..1403, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1400..1401, value: Int( 1, @@ -1670,7 +1670,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1402..1403, value: Int( 2, @@ -1687,7 +1687,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1408..1409, id: Name("f"), ctx: Store, @@ -1699,11 +1699,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1412..1415, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1412..1415, }, ), @@ -1714,20 +1714,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1416..1450, is_async: false, items: [ WithItem { range: 1422..1444, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1422..1439, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1423..1424, id: Name("x"), ctx: Load, @@ -1736,10 +1736,10 @@ Module( generators: [ Comprehension { range: 1425..1438, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1429..1430, id: Name("x"), ctx: Store, @@ -1747,7 +1747,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1434..1438, id: Name("iter"), ctx: Load, @@ -1763,7 +1763,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1443..1444, id: Name("y"), ctx: Store, @@ -1775,11 +1775,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1447..1450, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1447..1450, }, ), @@ -1790,16 +1790,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1663..1684, is_async: false, items: [ WithItem { range: 1668..1679, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1669..1673, id: Name("item"), ctx: Load, @@ -1808,7 +1808,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1678..1679, id: Name("f"), ctx: Store, @@ -1820,11 +1820,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1681..1684, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1681..1684, }, ), @@ -1835,20 +1835,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1685..1707, is_async: false, items: [ WithItem { range: 1690..1702, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1691..1701, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1691..1695, id: Name("item"), ctx: Store, @@ -1856,7 +1856,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1699..1701, value: Int( 10, @@ -1871,11 +1871,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1704..1707, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1704..1707, }, ), @@ -1886,20 +1886,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1708..1735, is_async: false, items: [ WithItem { range: 1713..1730, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1714..1724, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1714..1718, id: Name("item"), ctx: Store, @@ -1907,7 +1907,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1722..1724, value: Int( 10, @@ -1919,7 +1919,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1729..1730, id: Name("f"), ctx: Store, @@ -1931,11 +1931,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1732..1735, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1732..1735, }, ), @@ -1946,20 +1946,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1736..1762, is_async: false, items: [ WithItem { range: 1741..1757, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1744..1753, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1744..1748, id: Name("item"), ctx: Store, @@ -1967,7 +1967,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1752..1753, value: Int( 1, @@ -1982,11 +1982,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1759..1762, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1759..1762, }, ), @@ -1997,20 +1997,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1763..1793, is_async: false, items: [ WithItem { range: 1768..1781, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1769..1780, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1769..1774, id: Name("item1"), ctx: Store, @@ -2018,7 +2018,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1778..1780, value: Int( 42, @@ -2031,10 +2031,10 @@ Module( }, WithItem { range: 1783..1788, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1783..1788, id: Name("item2"), ctx: Load, @@ -2046,11 +2046,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1790..1793, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1790..1793, }, ), @@ -2061,28 +2061,28 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1794..1828, is_async: false, items: [ WithItem { range: 1799..1823, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1799..1823, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1799..1821, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1800..1815, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1800..1804, id: Name("root"), ctx: Load, @@ -2091,7 +2091,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1807..1815, id: Name("filename"), ctx: Load, @@ -2102,14 +2102,14 @@ Module( attr: Identifier { id: Name("read"), range: 1817..1821, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 1821..1823, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -2121,11 +2121,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1825..1828, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1825..1828, }, ), @@ -2136,28 +2136,28 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1851..1890, is_async: false, items: [ WithItem { range: 1856..1885, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1856..1880, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1856..1878, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1857..1872, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1857..1861, id: Name("root"), ctx: Load, @@ -2166,7 +2166,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1864..1872, id: Name("filename"), ctx: Load, @@ -2177,14 +2177,14 @@ Module( attr: Identifier { id: Name("read"), range: 1874..1878, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 1878..1880, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -2193,7 +2193,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1884..1885, id: Name("f"), ctx: Store, @@ -2205,11 +2205,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1887..1890, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1887..1890, }, ), @@ -2220,20 +2220,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1913..1930, is_async: false, items: [ WithItem { range: 1918..1925, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1918..1925, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1919..1922, id: Name("foo"), ctx: Load, @@ -2241,7 +2241,7 @@ Module( ), arguments: Arguments { range: 1923..1925, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -2253,11 +2253,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1927..1930, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1927..1930, }, ), @@ -2268,20 +2268,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1953..1975, is_async: false, items: [ WithItem { range: 1958..1970, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1958..1965, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1959..1962, id: Name("foo"), ctx: Load, @@ -2289,7 +2289,7 @@ Module( ), arguments: Arguments { range: 1963..1965, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -2298,7 +2298,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1969..1970, id: Name("f"), ctx: Store, @@ -2310,11 +2310,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1972..1975, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1972..1975, }, ), @@ -2325,20 +2325,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1998..2020, is_async: false, items: [ WithItem { range: 2003..2015, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2004..2009, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2004..2007, id: Name("foo"), ctx: Load, @@ -2346,7 +2346,7 @@ Module( ), arguments: Arguments { range: 2007..2009, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -2355,7 +2355,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2014..2015, id: Name("f"), ctx: Store, @@ -2367,11 +2367,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2017..2020, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2017..2020, }, ), @@ -2382,20 +2382,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2021..2047, is_async: false, items: [ WithItem { range: 2026..2042, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2027..2036, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2027..2031, id: Name("data"), ctx: Load, @@ -2403,12 +2403,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2032..2035, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2032..2033, value: Int( 1, @@ -2419,7 +2419,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2034..2035, value: Int( 2, @@ -2436,7 +2436,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2041..2042, id: Name("f"), ctx: Store, @@ -2448,11 +2448,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2044..2047, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2044..2047, }, ), @@ -2463,25 +2463,25 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2048..2070, is_async: false, items: [ WithItem { range: 2053..2065, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2053..2065, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2053..2062, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2054..2055, value: Int( 1, @@ -2490,7 +2490,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2057..2058, value: Int( 2, @@ -2499,7 +2499,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2060..2061, value: Int( 3, @@ -2513,7 +2513,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2063..2064, value: Int( 0, @@ -2529,11 +2529,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2067..2070, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2067..2070, }, ), @@ -2544,25 +2544,25 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2093..2120, is_async: false, items: [ WithItem { range: 2098..2115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2098..2110, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2098..2107, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2099..2100, value: Int( 1, @@ -2571,7 +2571,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2102..2103, value: Int( 2, @@ -2580,7 +2580,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2105..2106, value: Int( 3, @@ -2594,7 +2594,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2108..2109, value: Int( 0, @@ -2607,7 +2607,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2114..2115, id: Name("f"), ctx: Store, @@ -2619,11 +2619,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2117..2120, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2117..2120, }, ), @@ -2634,16 +2634,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2143..2169, is_async: false, items: [ WithItem { range: 2148..2155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2149..2154, id: Name("item1"), ctx: Load, @@ -2653,10 +2653,10 @@ Module( }, WithItem { range: 2157..2164, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2158..2163, id: Name("item2"), ctx: Load, @@ -2668,11 +2668,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2166..2169, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2166..2169, }, ), @@ -2683,20 +2683,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2170..2210, is_async: false, items: [ WithItem { range: 2175..2189, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2176..2188, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2176..2180, id: Name("open"), ctx: Load, @@ -2704,17 +2704,17 @@ Module( ), arguments: Arguments { range: 2180..2188, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2181..2187, value: StringLiteralValue { inner: Single( StringLiteral { range: 2181..2187, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "a.py", flags: StringLiteralFlags { quote_style: Single, @@ -2735,14 +2735,14 @@ Module( }, WithItem { range: 2191..2205, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2192..2204, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2192..2196, id: Name("open"), ctx: Load, @@ -2750,17 +2750,17 @@ Module( ), arguments: Arguments { range: 2196..2204, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2197..2203, value: StringLiteralValue { inner: Single( StringLiteral { range: 2197..2203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "b.py", flags: StringLiteralFlags { quote_style: Single, @@ -2783,11 +2783,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2207..2210, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2207..2210, }, ), @@ -2798,21 +2798,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2211..2230, is_async: false, items: [ WithItem { range: 2216..2225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2217..2224, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2223..2224, id: Name("x"), ctx: Load, @@ -2827,11 +2827,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2227..2230, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2227..2230, }, ), @@ -2842,21 +2842,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2231..2252, is_async: false, items: [ WithItem { range: 2237..2246, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2238..2245, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2244..2245, id: Name("x"), ctx: Load, @@ -2871,11 +2871,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2249..2252, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2249..2252, }, ), @@ -2886,20 +2886,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2253..2277, is_async: false, items: [ WithItem { range: 2258..2272, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2259..2271, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2270..2271, id: Name("x"), ctx: Load, @@ -2913,11 +2913,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2274..2277, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2274..2277, }, ), @@ -2928,20 +2928,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2278..2304, is_async: false, items: [ WithItem { range: 2284..2298, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2285..2297, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2296..2297, id: Name("x"), ctx: Load, @@ -2955,11 +2955,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2301..2304, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2301..2304, }, ), @@ -2970,21 +2970,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2305..2329, is_async: false, items: [ WithItem { range: 2310..2324, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2311..2318, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2317..2318, id: Name("x"), ctx: Load, @@ -2996,7 +2996,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2323..2324, id: Name("f"), ctx: Store, @@ -3008,11 +3008,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2326..2329, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2326..2329, }, ), @@ -3023,26 +3023,26 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2330..2355, is_async: false, items: [ WithItem { range: 2335..2350, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2336..2344, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2342..2344, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2342..2343, id: Name("x"), ctx: Load, @@ -3059,7 +3059,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2349..2350, id: Name("f"), ctx: Store, @@ -3071,11 +3071,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2352..2355, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2352..2355, }, ), @@ -3086,16 +3086,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2741..2753, is_async: false, items: [ WithItem { range: 2746..2748, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2746..2748, elts: [], ctx: Load, @@ -3108,11 +3108,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2750..2753, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2750..2753, }, ), @@ -3123,16 +3123,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2754..2771, is_async: false, items: [ WithItem { range: 2759..2766, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2759..2761, elts: [], ctx: Load, @@ -3142,7 +3142,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2765..2766, id: Name("f"), ctx: Store, @@ -3154,11 +3154,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2768..2771, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2768..2771, }, ), @@ -3169,25 +3169,25 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2772..2795, is_async: false, items: [ WithItem { range: 2777..2790, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2777..2790, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2778..2788, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2778..2782, id: Name("item"), ctx: Store, @@ -3195,7 +3195,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2786..2788, value: Int( 42, @@ -3215,11 +3215,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2792..2795, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2792..2795, }, ), @@ -3230,21 +3230,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2796..2820, is_async: false, items: [ WithItem { range: 2801..2815, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2801..2815, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2802..2803, value: Int( 1, @@ -3253,11 +3253,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2805..2814, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2805..2809, id: Name("item"), ctx: Store, @@ -3265,7 +3265,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2813..2814, value: Int( 2, @@ -3285,11 +3285,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2817..2820, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2817..2820, }, ), @@ -3300,25 +3300,25 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2821..2851, is_async: false, items: [ WithItem { range: 2826..2846, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2826..2846, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2827..2838, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2827..2832, id: Name("item1"), ctx: Store, @@ -3326,7 +3326,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2836..2838, value: Int( 10, @@ -3337,7 +3337,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2840..2845, id: Name("item2"), ctx: Load, @@ -3354,11 +3354,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2848..2851, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2848..2851, }, ), @@ -3369,21 +3369,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2852..2893, is_async: false, items: [ WithItem { range: 2857..2888, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2857..2883, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2858..2863, id: Name("item1"), ctx: Load, @@ -3391,11 +3391,11 @@ Module( ), Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2865..2875, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2865..2870, id: Name("item2"), ctx: Store, @@ -3403,7 +3403,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2874..2875, value: Int( 2, @@ -3414,7 +3414,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2877..2882, id: Name("item3"), ctx: Load, @@ -3428,7 +3428,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2887..2888, id: Name("f"), ctx: Store, @@ -3440,11 +3440,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2890..2893, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2890..2893, }, ), @@ -3455,21 +3455,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2894..2916, is_async: false, items: [ WithItem { range: 2899..2911, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2899..2906, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2900..2904, id: Name("item"), ctx: Load, @@ -3483,7 +3483,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2910..2911, id: Name("f"), ctx: Store, @@ -3495,11 +3495,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2913..2916, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2913..2916, }, ), @@ -3510,25 +3510,25 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2917..2935, is_async: false, items: [ WithItem { range: 2922..2930, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2922..2930, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2923..2928, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2924..2928, id: Name("item"), ctx: Load, @@ -3548,11 +3548,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2932..2935, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2932..2935, }, ), @@ -3563,25 +3563,25 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2936..2959, is_async: false, items: [ WithItem { range: 2941..2954, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2941..2949, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2942..2947, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2943..2947, id: Name("item"), ctx: Load, @@ -3598,7 +3598,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2953..2954, id: Name("f"), ctx: Store, @@ -3610,11 +3610,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2956..2959, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2956..2959, }, ), @@ -3625,21 +3625,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2960..2989, is_async: false, items: [ WithItem { range: 2965..2984, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2965..2979, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2966..2971, id: Name("item1"), ctx: Load, @@ -3647,7 +3647,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2973..2978, id: Name("item2"), ctx: Load, @@ -3661,7 +3661,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2983..2984, id: Name("f"), ctx: Store, @@ -3673,11 +3673,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2986..2989, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2986..2989, }, ), @@ -3688,21 +3688,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2990..3020, is_async: false, items: [ WithItem { range: 2995..3015, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2995..3010, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2996..3001, id: Name("item1"), ctx: Load, @@ -3710,7 +3710,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3003..3008, id: Name("item2"), ctx: Load, @@ -3724,7 +3724,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3014..3015, id: Name("f"), ctx: Store, @@ -3736,11 +3736,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3017..3020, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3017..3020, }, ), @@ -3751,21 +3751,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3021..3052, is_async: false, items: [ WithItem { range: 3026..3040, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3026..3040, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3027..3032, id: Name("item1"), ctx: Load, @@ -3773,7 +3773,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3034..3039, id: Name("item2"), ctx: Load, @@ -3788,10 +3788,10 @@ Module( }, WithItem { range: 3042..3047, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3042..3047, id: Name("item3"), ctx: Load, @@ -3803,11 +3803,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3049..3052, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3049..3052, }, ), @@ -3818,26 +3818,26 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3053..3091, is_async: false, items: [ WithItem { range: 3058..3086, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3058..3081, elts: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3059..3073, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3060..3065, id: Name("item1"), ctx: Load, @@ -3845,7 +3845,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3067..3072, id: Name("item2"), ctx: Load, @@ -3858,7 +3858,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3075..3080, id: Name("item3"), ctx: Load, @@ -3872,7 +3872,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3085..3086, id: Name("f"), ctx: Store, @@ -3884,11 +3884,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3088..3091, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3088..3091, }, ), @@ -3899,21 +3899,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3092..3138, is_async: false, items: [ WithItem { range: 3097..3105, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3097..3105, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3098..3103, id: Name("item1"), ctx: Load, @@ -3928,10 +3928,10 @@ Module( }, WithItem { range: 3107..3112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3107..3112, id: Name("item2"), ctx: Load, @@ -3941,15 +3941,15 @@ Module( }, WithItem { range: 3114..3133, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3114..3128, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3115..3120, id: Name("item3"), ctx: Load, @@ -3957,7 +3957,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3122..3127, id: Name("item4"), ctx: Load, @@ -3971,7 +3971,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3132..3133, id: Name("f"), ctx: Store, @@ -3983,11 +3983,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3135..3138, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3135..3138, }, ), @@ -3998,21 +3998,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3139..3182, is_async: false, items: [ WithItem { range: 3144..3164, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3144..3158, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3145..3150, id: Name("item1"), ctx: Load, @@ -4020,7 +4020,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3152..3157, id: Name("item2"), ctx: Load, @@ -4034,7 +4034,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3162..3164, id: Name("f1"), ctx: Store, @@ -4044,10 +4044,10 @@ Module( }, WithItem { range: 3166..3177, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3166..3171, id: Name("item3"), ctx: Load, @@ -4056,7 +4056,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3175..3177, id: Name("f2"), ctx: Store, @@ -4068,11 +4068,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3179..3182, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3179..3182, }, ), @@ -4083,21 +4083,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3183..3208, is_async: false, items: [ WithItem { range: 3188..3203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3188..3203, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3189..3194, id: Name("item1"), ctx: Load, @@ -4105,11 +4105,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3196..3202, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3197..3202, id: Name("item2"), ctx: Load, @@ -4129,11 +4129,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3205..3208, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3205..3208, }, ), @@ -4144,21 +4144,21 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3209..3239, is_async: false, items: [ WithItem { range: 3214..3234, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3214..3229, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3215..3220, id: Name("item1"), ctx: Load, @@ -4166,11 +4166,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3222..3228, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3223..3228, id: Name("item2"), ctx: Load, @@ -4187,7 +4187,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3233..3234, id: Name("f"), ctx: Store, @@ -4199,11 +4199,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3236..3239, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3236..3239, }, ), @@ -4214,25 +4214,25 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3240..3271, is_async: false, items: [ WithItem { range: 3245..3266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3245..3266, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3246..3257, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3246..3251, id: Name("item1"), ctx: Store, @@ -4240,7 +4240,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3255..3257, value: Int( 10, @@ -4251,11 +4251,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3259..3265, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3260..3265, id: Name("item2"), ctx: Load, @@ -4275,11 +4275,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3268..3271, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3268..3271, }, ), @@ -4290,25 +4290,25 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3272..3305, is_async: false, items: [ WithItem { range: 3277..3300, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3277..3300, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3279..3290, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3279..3284, id: Name("item1"), ctx: Store, @@ -4316,7 +4316,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3288..3290, value: Int( 10, @@ -4327,11 +4327,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3293..3299, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3294..3299, id: Name("item2"), ctx: Load, @@ -4351,11 +4351,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3302..3305, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3302..3305, }, ), @@ -4366,20 +4366,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3510..3542, is_async: false, items: [ WithItem { range: 3515..3537, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3515..3537, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3516..3517, id: Name("x"), ctx: Load, @@ -4388,10 +4388,10 @@ Module( generators: [ Comprehension { range: 3518..3536, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3522..3523, id: Name("x"), ctx: Store, @@ -4399,11 +4399,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3527..3536, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3527..3532, id: Name("range"), ctx: Load, @@ -4411,11 +4411,11 @@ Module( ), arguments: Arguments { range: 3532..3536, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3533..3535, value: Int( 10, @@ -4440,11 +4440,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3539..3542, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3539..3542, }, ), @@ -4455,20 +4455,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3543..3581, is_async: false, items: [ WithItem { range: 3548..3576, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3548..3576, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3549..3550, id: Name("x"), ctx: Load, @@ -4477,10 +4477,10 @@ Module( generators: [ Comprehension { range: 3551..3575, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3561..3562, id: Name("x"), ctx: Store, @@ -4488,11 +4488,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3566..3575, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3566..3571, id: Name("range"), ctx: Load, @@ -4500,11 +4500,11 @@ Module( ), arguments: Arguments { range: 3571..3575, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3572..3574, value: Int( 10, @@ -4529,11 +4529,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3578..3581, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3578..3581, }, ), @@ -4544,20 +4544,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3582..3620, is_async: false, items: [ WithItem { range: 3587..3609, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Generator( ExprGenerator { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3587..3609, elt: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3588..3589, id: Name("x"), ctx: Load, @@ -4566,10 +4566,10 @@ Module( generators: [ Comprehension { range: 3590..3608, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3594..3595, id: Name("x"), ctx: Store, @@ -4577,11 +4577,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3599..3608, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3599..3604, id: Name("range"), ctx: Load, @@ -4589,11 +4589,11 @@ Module( ), arguments: Arguments { range: 3604..3608, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3605..3607, value: Int( 10, @@ -4616,10 +4616,10 @@ Module( }, WithItem { range: 3611..3615, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3611..3615, id: Name("item"), ctx: Load, @@ -4631,11 +4631,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3617..3620, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3617..3620, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap index 4f2c579ca3..dfcabffa76 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/annotated_assign ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..103, body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -24,7 +24,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..6, id: Name("int"), ctx: Load, @@ -36,11 +36,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..17, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("x"), ctx: Store, @@ -48,7 +48,7 @@ Module( ), annotation: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 10..13, id: Name("int"), ctx: Load, @@ -57,7 +57,7 @@ Module( value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, value: Int( 1, @@ -70,11 +70,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..28, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("x"), ctx: Store, @@ -82,11 +82,11 @@ Module( ), annotation: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..28, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, value: Int( 1, @@ -96,7 +96,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..28, value: Int( 2, @@ -111,11 +111,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..55, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, id: Name("x"), ctx: Store, @@ -123,15 +123,15 @@ Module( ), annotation: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..48, left: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..42, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..37, id: Name("tuple"), ctx: Load, @@ -139,7 +139,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..41, id: Name("int"), ctx: Load, @@ -151,7 +151,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..48, id: Name("int"), ctx: Load, @@ -162,12 +162,12 @@ Module( value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..55, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, value: Int( 1, @@ -185,11 +185,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..83, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("x"), ctx: Store, @@ -197,18 +197,18 @@ Module( ), annotation: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..79, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..70, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..62, id: Name("int"), ctx: Load, @@ -216,7 +216,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..79, id: Name("str"), ctx: Load, @@ -227,7 +227,7 @@ Module( value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, value: Int( 1, @@ -240,11 +240,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..102, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..85, id: Name("x"), ctx: Store, @@ -252,26 +252,24 @@ Module( ), annotation: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..98, parameters: Some( Parameters { range: 94..95, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 94..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 94..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 94..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -285,7 +283,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..98, id: Name("y"), ctx: Load, @@ -296,7 +294,7 @@ Module( value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..102, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap index e73517455e..b3cb2bc013 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/valid/statement/assert.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..186, body: [ Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, test: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..12, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, value: Int( 1, @@ -33,7 +33,7 @@ Module( comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, value: Int( 2, @@ -48,15 +48,15 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..26, test: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..26, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..24, id: Name("call"), ctx: Load, @@ -64,7 +64,7 @@ Module( ), arguments: Arguments { range: 24..26, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -75,17 +75,17 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..41, test: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..41, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..35, id: Name("a"), ctx: Load, @@ -93,7 +93,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..41, id: Name("b"), ctx: Load, @@ -107,30 +107,28 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..60, test: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..60, parameters: Some( Parameters { range: 56..57, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 56..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -144,7 +142,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..60, id: Name("y"), ctx: Load, @@ -157,15 +155,15 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..75, test: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..75, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, id: Name("x"), ctx: Load, @@ -178,22 +176,22 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..99, test: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..99, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..92, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, id: Name("x"), ctx: Load, @@ -201,7 +199,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, id: Name("y"), ctx: Load, @@ -214,11 +212,11 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..118, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..109, id: Name("x"), ctx: Load, @@ -227,13 +225,13 @@ Module( msg: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..118, value: StringLiteralValue { inner: Single( StringLiteral { range: 111..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "error", flags: StringLiteralFlags { quote_style: Double, @@ -250,11 +248,11 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..140, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..127, id: Name("x"), ctx: Load, @@ -263,26 +261,24 @@ Module( msg: Some( Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..140, parameters: Some( Parameters { range: 136..137, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 136..137, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 136..137, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 136..137, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -296,7 +292,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..140, id: Name("y"), ctx: Load, @@ -309,11 +305,11 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..158, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..149, id: Name("x"), ctx: Load, @@ -322,11 +318,11 @@ Module( msg: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..158, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..158, id: Name("x"), ctx: Load, @@ -339,11 +335,11 @@ Module( ), Assert( StmtAssert { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..185, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..167, id: Name("x"), ctx: Load, @@ -352,18 +348,18 @@ Module( msg: Some( If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..185, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..178, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..170, id: Name("x"), ctx: Load, @@ -371,7 +367,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 184..185, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap index d649315b7d..852bb10a83 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/valid/statement/assignment.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..729, body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..13, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -26,12 +26,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..13, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, value: Int( 1, @@ -40,7 +40,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, value: Int( 2, @@ -49,7 +49,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, value: Int( 3, @@ -65,17 +65,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..33, targets: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..21, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..17, id: Name("x"), ctx: Store, @@ -83,7 +83,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 19..20, id: Name("y"), ctx: Store, @@ -97,12 +97,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..33, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, value: Int( 1, @@ -111,7 +111,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, value: Int( 2, @@ -120,7 +120,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..32, value: Int( 3, @@ -136,17 +136,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..53, targets: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..41, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, id: Name("x"), ctx: Store, @@ -154,7 +154,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("y"), ctx: Store, @@ -167,12 +167,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..53, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..46, value: Int( 1, @@ -181,7 +181,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..49, value: Int( 2, @@ -190,7 +190,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 3, @@ -206,16 +206,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..70, targets: [ Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..58, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, id: Name("x"), ctx: Load, @@ -224,7 +224,7 @@ Module( attr: Identifier { id: Name("y"), range: 57..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Store, }, @@ -232,12 +232,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..70, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..63, value: Int( 1, @@ -246,7 +246,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, value: Int( 2, @@ -255,7 +255,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, value: Int( 3, @@ -271,16 +271,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..88, targets: [ Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..76, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("x"), ctx: Load, @@ -288,7 +288,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..75, id: Name("y"), ctx: Load, @@ -300,12 +300,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..88, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..81, value: Int( 1, @@ -314,7 +314,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, value: Int( 2, @@ -323,7 +323,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..87, value: Int( 3, @@ -339,17 +339,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..109, targets: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..97, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..92, id: Name("x"), ctx: Store, @@ -357,11 +357,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..96, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..96, id: Name("y"), ctx: Store, @@ -378,12 +378,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..109, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..102, value: Int( 1, @@ -392,7 +392,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, value: Int( 2, @@ -401,7 +401,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..108, value: Int( 3, @@ -417,17 +417,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..280, targets: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..268, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..261, id: Name("x"), ctx: Store, @@ -435,7 +435,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 263..264, id: Name("y"), ctx: Store, @@ -443,7 +443,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 266..267, id: Name("z"), ctx: Store, @@ -456,12 +456,12 @@ Module( ], value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..280, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 272..273, value: Int( 1, @@ -470,7 +470,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 275..276, value: Int( 2, @@ -479,7 +479,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 278..279, value: Int( 3, @@ -494,17 +494,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..303, targets: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..291, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 283..284, id: Name("x"), ctx: Store, @@ -512,7 +512,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..287, id: Name("y"), ctx: Store, @@ -520,7 +520,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 289..290, id: Name("z"), ctx: Store, @@ -534,12 +534,12 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 294..303, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 295..296, value: Int( 1, @@ -548,7 +548,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 298..299, value: Int( 2, @@ -557,7 +557,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..302, value: Int( 3, @@ -573,16 +573,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 304..313, targets: [ Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 304..308, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 304..305, id: Name("x"), ctx: Load, @@ -590,7 +590,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..307, value: Int( 0, @@ -603,7 +603,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 311..313, value: Int( 42, @@ -614,16 +614,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 410..419, targets: [ Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 410..414, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 410..411, value: Int( 5, @@ -632,7 +632,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 412..413, value: Int( 0, @@ -645,7 +645,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 417..419, value: Int( 42, @@ -656,16 +656,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 420..433, targets: [ Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 420..426, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 420..421, id: Name("x"), ctx: Load, @@ -673,12 +673,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 422..425, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 422..423, value: Int( 1, @@ -689,7 +689,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 424..425, value: Int( 2, @@ -706,12 +706,12 @@ Module( ], value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 429..433, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 430..432, value: Int( 42, @@ -726,16 +726,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 529..542, targets: [ Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 529..535, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 529..530, value: Int( 5, @@ -744,12 +744,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 531..534, lower: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 531..532, value: Int( 1, @@ -760,7 +760,7 @@ Module( upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 533..534, value: Int( 2, @@ -777,12 +777,12 @@ Module( ], value: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 538..542, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 539..541, value: Int( 42, @@ -797,16 +797,16 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 544..556, targets: [ Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 544..551, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 544..547, id: Name("foo"), ctx: Load, @@ -815,7 +815,7 @@ Module( attr: Identifier { id: Name("bar"), range: 548..551, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Store, }, @@ -823,7 +823,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 554..556, value: Int( 42, @@ -834,22 +834,22 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 658..670, targets: [ Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 658..665, value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 658..663, value: StringLiteralValue { inner: Single( StringLiteral { range: 658..663, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo", flags: StringLiteralFlags { quote_style: Double, @@ -864,7 +864,7 @@ Module( attr: Identifier { id: Name("y"), range: 664..665, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Store, }, @@ -872,7 +872,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 668..670, value: Int( 42, @@ -883,12 +883,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 672..680, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 672..675, id: Name("foo"), ctx: Store, @@ -897,7 +897,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 678..680, value: Int( 42, @@ -908,12 +908,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 682..695, targets: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 682..684, elts: [], ctx: Store, @@ -922,16 +922,16 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 687..695, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 688..693, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 689..693, id: Name("data"), ctx: Load, @@ -949,12 +949,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 696..709, targets: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 696..698, elts: [], ctx: Store, @@ -964,16 +964,16 @@ Module( ], value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 701..709, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 702..707, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 703..707, id: Name("data"), ctx: Load, @@ -991,17 +991,17 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 710..719, targets: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 710..714, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 710..711, id: Name("a"), ctx: Store, @@ -1009,7 +1009,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 713..714, id: Name("b"), ctx: Store, @@ -1023,7 +1023,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 717..719, id: Name("ab"), ctx: Load, @@ -1033,12 +1033,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 720..729, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 720..721, id: Name("a"), ctx: Store, @@ -1046,7 +1046,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 724..725, id: Name("b"), ctx: Store, @@ -1055,7 +1055,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 728..729, id: Name("c"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap index aabb6b245b..3b4ad5727e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/augmented_assign ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..212, body: [ AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1, id: Name("x"), ctx: Store, @@ -25,7 +25,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, value: Int( 1, @@ -36,15 +36,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..23, target: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..10, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..8, id: Name("x"), ctx: Load, @@ -53,7 +53,7 @@ Module( attr: Identifier { id: Name("y"), range: 9..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Store, }, @@ -61,12 +61,12 @@ Module( op: Add, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..23, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 15..16, value: Int( 1, @@ -75,7 +75,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, value: Int( 2, @@ -84,7 +84,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, value: Int( 3, @@ -100,15 +100,15 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..41, target: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..28, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("x"), ctx: Load, @@ -116,7 +116,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..27, id: Name("y"), ctx: Load, @@ -128,12 +128,12 @@ Module( op: Add, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..41, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..34, value: Int( 1, @@ -142,7 +142,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, value: Int( 2, @@ -151,7 +151,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, value: Int( 3, @@ -167,11 +167,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..92, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..87, id: Name("x"), ctx: Store, @@ -180,7 +180,7 @@ Module( op: Add, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..92, value: Int( 1, @@ -191,11 +191,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..99, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, id: Name("x"), ctx: Store, @@ -204,7 +204,7 @@ Module( op: Sub, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, value: Int( 1, @@ -215,11 +215,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..106, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, id: Name("x"), ctx: Store, @@ -228,7 +228,7 @@ Module( op: Mult, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, value: Int( 1, @@ -239,11 +239,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..113, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..108, id: Name("x"), ctx: Store, @@ -252,7 +252,7 @@ Module( op: Div, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..113, value: Int( 1, @@ -263,11 +263,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..121, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..115, id: Name("x"), ctx: Store, @@ -276,7 +276,7 @@ Module( op: FloorDiv, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..121, value: Int( 1, @@ -287,11 +287,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..128, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, id: Name("x"), ctx: Store, @@ -300,7 +300,7 @@ Module( op: Mod, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 127..128, value: Int( 1, @@ -311,11 +311,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..136, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..130, id: Name("x"), ctx: Store, @@ -324,7 +324,7 @@ Module( op: Pow, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..136, value: Int( 1, @@ -335,11 +335,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..143, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..138, id: Name("x"), ctx: Store, @@ -348,7 +348,7 @@ Module( op: BitAnd, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..143, value: Int( 1, @@ -359,11 +359,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..150, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..145, id: Name("x"), ctx: Store, @@ -372,7 +372,7 @@ Module( op: BitOr, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..150, value: Int( 1, @@ -383,11 +383,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..157, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..152, id: Name("x"), ctx: Store, @@ -396,7 +396,7 @@ Module( op: BitXor, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..157, value: Int( 1, @@ -407,11 +407,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..165, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..159, id: Name("x"), ctx: Store, @@ -420,7 +420,7 @@ Module( op: LShift, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..165, value: Int( 1, @@ -431,11 +431,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..173, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..167, id: Name("x"), ctx: Store, @@ -444,7 +444,7 @@ Module( op: RShift, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..173, value: Int( 1, @@ -455,11 +455,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..180, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 174..175, id: Name("x"), ctx: Store, @@ -468,7 +468,7 @@ Module( op: MatMult, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..180, value: Int( 1, @@ -479,11 +479,11 @@ Module( ), AugAssign( StmtAugAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..212, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..191, id: Name("a"), ctx: Store, @@ -492,15 +492,15 @@ Module( op: FloorDiv, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..212, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..202, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..198, id: Name("a"), ctx: Load, @@ -509,7 +509,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 201..202, id: Name("b"), ctx: Load, @@ -520,11 +520,11 @@ Module( op: Sub, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..212, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..207, id: Name("c"), ctx: Load, @@ -533,7 +533,7 @@ Module( op: Pow, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..212, value: Int( 2, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap index 9882e26371..981e0fe0de 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap @@ -7,29 +7,29 @@ input_file: crates/ruff_python_parser/resources/valid/statement/class.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1023, body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..19, decorator_list: [], name: Identifier { id: Name("Test"), range: 6..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..19, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..19, }, ), @@ -40,19 +40,19 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..80, decorator_list: [], name: Identifier { id: Name("Test"), range: 28..32, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 32..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -60,33 +60,31 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..80, is_async: false, decorator_list: [], name: Identifier { id: Name("__init__"), range: 48..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 56..62, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 57..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 57..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("self"), range: 57..61, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -101,7 +99,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..80, }, ), @@ -113,27 +111,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..116, decorator_list: [], name: Identifier { id: Name("Test"), range: 89..93, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 93..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..101, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..101, id: Name("A"), ctx: Load, @@ -146,17 +144,17 @@ Module( keywords: [ Keyword { range: 94..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("a"), range: 94..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, value: Int( 1, @@ -166,11 +164,11 @@ Module( }, Keyword { range: 103..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, id: Name("k"), ctx: Load, @@ -183,11 +181,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..116, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..116, }, ), @@ -198,34 +196,32 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..168, decorator_list: [], name: Identifier { id: Name("Test"), range: 125..129, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: None, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..168, is_async: false, decorator_list: [], name: Identifier { id: Name("method"), range: 139..145, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 145..147, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -236,17 +232,17 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..168, targets: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..161, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..158, id: Name("a"), ctx: Store, @@ -254,7 +250,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..161, id: Name("b"), ctx: Store, @@ -268,7 +264,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..168, id: Name("data"), ctx: Load, @@ -284,23 +280,23 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..289, decorator_list: [], name: Identifier { id: Name("Test"), range: 177..181, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 181..187, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 182..183, id: Name("A"), ctx: Load, @@ -308,7 +304,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 185..186, id: Name("B"), ctx: Load, @@ -321,33 +317,31 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 193..225, is_async: false, decorator_list: [], name: Identifier { id: Name("__init__"), range: 197..205, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 205..211, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 206..210, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 206..210, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("self"), range: 206..210, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -362,7 +356,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..225, }, ), @@ -371,33 +365,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..289, is_async: false, decorator_list: [], name: Identifier { id: Name("method_with_default"), range: 235..254, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 254..275, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 255..259, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 255..259, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("self"), range: 255..259, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -405,27 +397,27 @@ Module( }, ParameterWithDefault { range: 261..274, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 261..264, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 261..264, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 265..274, value: StringLiteralValue { inner: Single( StringLiteral { range: 265..274, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "default", flags: StringLiteralFlags { quote_style: Single, @@ -448,7 +440,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 285..289, }, ), @@ -460,27 +452,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..351, decorator_list: [], name: Identifier { id: Name("Test"), range: 337..341, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 341..344, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 342..343, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 342..343, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -492,7 +484,7 @@ Module( arguments: Some( Arguments { range: 344..346, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -500,11 +492,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..351, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 348..351, }, ), @@ -515,33 +507,33 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 376..402, decorator_list: [], name: Identifier { id: Name("Test"), range: 382..386, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 386..395, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 387..394, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 387..388, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 391..394, id: Name("str"), ctx: Load, @@ -556,7 +548,7 @@ Module( arguments: Some( Arguments { range: 395..397, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -564,11 +556,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 399..402, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 399..402, }, ), @@ -579,32 +571,32 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 425..450, decorator_list: [], name: Identifier { id: Name("Test"), range: 431..435, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 435..443, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 436..442, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 436..437, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 439..442, id: Name("str"), ctx: Load, @@ -620,7 +612,7 @@ Module( arguments: Some( Arguments { range: 443..445, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -628,11 +620,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 447..450, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 447..450, }, ), @@ -643,36 +635,36 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 485..522, decorator_list: [], name: Identifier { id: Name("Test"), range: 491..495, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 495..515, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 496..514, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 496..497, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 499..508, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 499..502, id: Name("int"), ctx: Load, @@ -681,7 +673,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 505..508, id: Name("str"), ctx: Load, @@ -693,7 +685,7 @@ Module( default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 511..514, id: Name("int"), ctx: Load, @@ -708,7 +700,7 @@ Module( arguments: Some( Arguments { range: 515..517, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -716,11 +708,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 519..522, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 519..522, }, ), @@ -731,37 +723,37 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 551..585, decorator_list: [], name: Identifier { id: Name("Test"), range: 557..561, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 561..578, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 562..577, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 562..563, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 565..577, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 566..569, id: Name("str"), ctx: Load, @@ -769,7 +761,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 571..576, id: Name("bytes"), ctx: Load, @@ -790,7 +782,7 @@ Module( arguments: Some( Arguments { range: 578..580, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -798,11 +790,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 582..585, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 582..585, }, ), @@ -813,27 +805,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 606..629, decorator_list: [], name: Identifier { id: Name("Test"), range: 612..616, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 616..622, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 617..618, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 617..618, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -842,11 +834,11 @@ Module( TypeVar( TypeParamTypeVar { range: 620..621, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("U"), range: 620..621, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -858,7 +850,7 @@ Module( arguments: Some( Arguments { range: 622..624, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -866,11 +858,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 626..629, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 626..629, }, ), @@ -881,27 +873,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 648..672, decorator_list: [], name: Identifier { id: Name("Test"), range: 654..658, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 658..665, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 659..660, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 659..660, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -910,11 +902,11 @@ Module( TypeVar( TypeParamTypeVar { range: 662..663, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("U"), range: 662..663, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -926,7 +918,7 @@ Module( arguments: Some( Arguments { range: 665..667, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -934,11 +926,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 669..672, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 669..672, }, ), @@ -949,27 +941,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 689..711, decorator_list: [], name: Identifier { id: Name("Test"), range: 695..699, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 699..704, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 700..703, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 701..703, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -980,7 +972,7 @@ Module( arguments: Some( Arguments { range: 704..706, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -988,11 +980,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 708..711, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 708..711, }, ), @@ -1003,36 +995,36 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 741..789, decorator_list: [], name: Identifier { id: Name("Test"), range: 747..751, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 751..782, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 752..781, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 753..755, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 758..781, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 758..764, id: Name("Unpack"), ctx: Load, @@ -1040,11 +1032,11 @@ Module( ), slice: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 765..780, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 765..770, id: Name("tuple"), ctx: Load, @@ -1052,12 +1044,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 771..779, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 771..774, id: Name("int"), ctx: Load, @@ -1065,7 +1057,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 776..779, id: Name("str"), ctx: Load, @@ -1091,7 +1083,7 @@ Module( arguments: Some( Arguments { range: 782..784, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1099,11 +1091,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 786..789, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 786..789, }, ), @@ -1114,40 +1106,40 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 827..868, decorator_list: [], name: Identifier { id: Name("Test"), range: 833..837, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 837..861, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 838..860, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 839..841, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 844..860, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 845..860, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 845..850, id: Name("tuple"), ctx: Load, @@ -1155,12 +1147,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 851..859, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 851..854, id: Name("int"), ctx: Load, @@ -1168,7 +1160,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 856..859, id: Name("str"), ctx: Load, @@ -1194,7 +1186,7 @@ Module( arguments: Some( Arguments { range: 861..863, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1202,11 +1194,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 865..868, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 865..868, }, ), @@ -1217,27 +1209,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 882..904, decorator_list: [], name: Identifier { id: Name("Test"), range: 888..892, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 892..897, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 893..896, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 895..896, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -1248,7 +1240,7 @@ Module( arguments: Some( Arguments { range: 897..899, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1256,11 +1248,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 901..904, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 901..904, }, ), @@ -1271,37 +1263,37 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 931..966, decorator_list: [], name: Identifier { id: Name("Test"), range: 937..941, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 941..959, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 942..958, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 944..945, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 948..958, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 949..952, id: Name("int"), ctx: Load, @@ -1309,7 +1301,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 954..957, id: Name("str"), ctx: Load, @@ -1328,7 +1320,7 @@ Module( arguments: Some( Arguments { range: 959..961, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1336,11 +1328,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 963..966, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 963..966, }, ), @@ -1351,27 +1343,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 982..1022, decorator_list: [], name: Identifier { id: Name("Test"), range: 988..992, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 992..1012, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 993..994, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("X"), range: 993..994, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -1380,16 +1372,16 @@ Module( TypeVar( TypeParamTypeVar { range: 996..1002, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Y"), range: 996..997, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 999..1002, id: Name("str"), ctx: Load, @@ -1402,11 +1394,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 1004..1006, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("U"), range: 1005..1006, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -1414,11 +1406,11 @@ Module( ParamSpec( TypeParamParamSpec { range: 1008..1011, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 1010..1011, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -1429,7 +1421,7 @@ Module( arguments: Some( Arguments { range: 1012..1014, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1437,7 +1429,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1018..1022, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap index bc20d70fae..50f3cb4b0b 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/valid/statement/delete.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..122, body: [ Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..5, id: Name("x"), ctx: Del, @@ -28,12 +28,12 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..13, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 11..12, id: Name("x"), ctx: Del, @@ -44,12 +44,12 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..23, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("a"), ctx: Del, @@ -57,7 +57,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, id: Name("b"), ctx: Del, @@ -68,12 +68,12 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..40, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, id: Name("a"), ctx: Del, @@ -81,12 +81,12 @@ Module( ), Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..37, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..33, id: Name("b"), ctx: Del, @@ -94,7 +94,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 35..36, id: Name("c"), ctx: Del, @@ -107,7 +107,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..40, id: Name("d"), ctx: Del, @@ -118,17 +118,17 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..51, targets: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..51, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, id: Name("a"), ctx: Del, @@ -136,7 +136,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, id: Name("b"), ctx: Del, @@ -151,17 +151,17 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..70, targets: [ List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..70, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..58, id: Name("a"), ctx: Del, @@ -169,12 +169,12 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..66, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..62, id: Name("b"), ctx: Del, @@ -182,7 +182,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..65, id: Name("c"), ctx: Del, @@ -194,7 +194,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("d"), ctx: Del, @@ -209,16 +209,16 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..78, targets: [ Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..78, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, id: Name("x"), ctx: Load, @@ -227,7 +227,7 @@ Module( attr: Identifier { id: Name("y"), range: 77..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Del, }, @@ -237,16 +237,16 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..87, targets: [ Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..87, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, id: Name("x"), ctx: Load, @@ -254,7 +254,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..86, id: Name("y"), ctx: Load, @@ -268,17 +268,17 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..121, targets: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 92..121, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, id: Name("x"), ctx: Del, @@ -286,11 +286,11 @@ Module( ), Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..108, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, id: Name("x"), ctx: Load, @@ -299,18 +299,18 @@ Module( attr: Identifier { id: Name("y"), range: 107..108, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Del, }, ), Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..118, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..115, id: Name("x"), ctx: Load, @@ -318,7 +318,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 116..117, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap index a003c4896d..2687f08bc2 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap @@ -7,17 +7,17 @@ input_file: crates/ruff_python_parser/resources/valid/statement/for.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..523, body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4..10, id: Name("target"), ctx: Store, @@ -25,7 +25,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..18, id: Name("iter"), ctx: Load, @@ -34,7 +34,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..28, }, ), @@ -44,12 +44,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..63, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..40, id: Name("target"), ctx: Store, @@ -57,12 +57,12 @@ Module( ), iter: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..53, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..46, value: Int( 1, @@ -71,7 +71,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..49, value: Int( 2, @@ -80,7 +80,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 3, @@ -95,7 +95,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..63, }, ), @@ -105,16 +105,16 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..100, is_async: false, target: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..80, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..75, id: Name("target"), ctx: Load, @@ -123,18 +123,18 @@ Module( attr: Identifier { id: Name("attr"), range: 76..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Store, }, ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..90, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..88, id: Name("call"), ctx: Load, @@ -142,7 +142,7 @@ Module( ), arguments: Arguments { range: 88..90, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -151,7 +151,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..100, }, ), @@ -161,16 +161,16 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..135, is_async: false, target: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..115, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..112, id: Name("target"), ctx: Load, @@ -178,7 +178,7 @@ Module( ), slice: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..114, value: Int( 0, @@ -190,11 +190,11 @@ Module( ), iter: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..125, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..120, id: Name("x"), ctx: Load, @@ -203,7 +203,7 @@ Module( attr: Identifier { id: Name("attr"), range: 121..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -211,7 +211,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..135, }, ), @@ -221,12 +221,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..167, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..147, id: Name("target"), ctx: Store, @@ -234,11 +234,11 @@ Module( ), iter: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..157, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..152, id: Name("x"), ctx: Load, @@ -250,7 +250,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..157, id: Name("y"), ctx: Load, @@ -262,7 +262,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..167, }, ), @@ -272,12 +272,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..200, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 173..179, id: Name("target"), ctx: Store, @@ -285,13 +285,13 @@ Module( ), iter: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..190, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 183..184, id: Name("a"), ctx: Load, @@ -299,7 +299,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..190, id: Name("b"), ctx: Load, @@ -311,7 +311,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..200, }, ), @@ -321,17 +321,17 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 202..232, is_async: false, target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..214, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..207, id: Name("a"), ctx: Store, @@ -339,7 +339,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 209..210, id: Name("b"), ctx: Store, @@ -347,7 +347,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 212..213, id: Name("c"), ctx: Store, @@ -360,7 +360,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 218..222, id: Name("iter"), ctx: Load, @@ -369,7 +369,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..232, }, ), @@ -379,17 +379,17 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 234..262, is_async: false, target: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 238..244, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..240, id: Name("a"), ctx: Store, @@ -397,7 +397,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 242..243, id: Name("b"), ctx: Store, @@ -410,7 +410,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 248..252, id: Name("iter"), ctx: Load, @@ -419,7 +419,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..262, }, ), @@ -429,12 +429,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..294, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 268..274, id: Name("target"), ctx: Store, @@ -442,12 +442,12 @@ Module( ), iter: List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 278..284, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 279..280, value: Int( 1, @@ -456,7 +456,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 282..283, value: Int( 2, @@ -470,7 +470,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 290..294, }, ), @@ -480,12 +480,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 296..322, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..306, id: Name("target"), ctx: Store, @@ -493,11 +493,11 @@ Module( ), iter: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..317, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 316..317, id: Name("x"), ctx: Load, @@ -508,11 +508,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..322, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 319..322, }, ), @@ -524,12 +524,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 323..353, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..333, id: Name("target"), ctx: Store, @@ -537,26 +537,24 @@ Module( ), iter: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 337..348, parameters: Some( Parameters { range: 344..345, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 344..345, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 344..345, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 344..345, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -570,7 +568,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 347..348, id: Name("x"), ctx: Load, @@ -581,11 +579,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 350..353, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 350..353, }, ), @@ -597,12 +595,12 @@ Module( ), For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 354..389, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 358..364, id: Name("target"), ctx: Store, @@ -610,18 +608,18 @@ Module( ), iter: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 368..384, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 373..377, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 368..369, id: Name("x"), ctx: Load, @@ -629,7 +627,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..384, id: Name("y"), ctx: Load, @@ -640,11 +638,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 386..389, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 386..389, }, ), @@ -656,11 +654,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 391..522, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 394..395, id: Name("x"), ctx: Load, @@ -669,12 +667,12 @@ Module( body: [ For( StmtFor { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 401..433, is_async: false, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 405..411, id: Name("target"), ctx: Store, @@ -682,7 +680,7 @@ Module( ), iter: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 415..419, id: Name("iter"), ctx: Load, @@ -691,7 +689,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 429..433, }, ), @@ -703,12 +701,12 @@ Module( elif_else_clauses: [ ElifElseClause { range: 508..522, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 518..522, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap index d6f6e50158..c962949c16 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap @@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/valid/statement/from_import.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..259, body: [ ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, module: Some( Identifier { id: Name("a"), range: 5..6, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 14..15, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -38,17 +38,17 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..42, module: None, names: [ Alias { range: 41..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 41..42, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -58,45 +58,45 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..85, module: Some( Identifier { id: Name("foo.bar"), range: 48..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 63..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("baz"), range: 63..66, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("b"), range: 70..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, Alias { range: 73..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("FooBar"), range: 73..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("fb"), range: 83..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -106,23 +106,23 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..102, module: Some( Identifier { id: Name("a"), range: 92..93, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 101..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 101..102, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -132,17 +132,17 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..120, module: None, names: [ Alias { range: 119..120, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 119..120, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -152,17 +152,17 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 121..161, module: None, names: [ Alias { range: 160..161, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 160..161, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -172,23 +172,23 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..207, module: Some( Identifier { id: Name("a.b.c"), range: 193..198, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 206..207, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 206..207, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -198,49 +198,49 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..242, module: Some( Identifier { id: Name("module"), range: 213..219, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 228..229, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 228..229, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 231..237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 231..232, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("B"), range: 236..237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, Alias { range: 239..240, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 239..240, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -250,23 +250,23 @@ Module( ), ImportFrom( StmtImportFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 243..258, module: Some( Identifier { id: Name("a"), range: 248..249, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), names: [ Alias { range: 257..258, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("*"), range: 257..258, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap index d2b7caef14..e715f81366 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/valid/statement/function.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..2399, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..29, is_async: false, decorator_list: [], name: Identifier { id: Name("no_parameters"), range: 4..17, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 17..19, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -37,7 +35,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..29, }, ), @@ -46,33 +44,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..76, is_async: false, decorator_list: [], name: Identifier { id: Name("positional_parameters"), range: 36..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 57..66, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 58..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 58..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 58..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -80,14 +76,14 @@ Module( }, ParameterWithDefault { range: 61..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 61..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 61..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -95,14 +91,14 @@ Module( }, ParameterWithDefault { range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -117,7 +113,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..76, }, ), @@ -126,33 +122,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..149, is_async: false, decorator_list: [], name: Identifier { id: Name("positional_parameters_with_default_values"), range: 83..124, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 124..139, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 125..126, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 125..126, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 125..126, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -160,21 +154,21 @@ Module( }, ParameterWithDefault { range: 128..132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 128..129, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 128..129, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 130..132, value: Int( 20, @@ -185,21 +179,21 @@ Module( }, ParameterWithDefault { range: 134..138, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 134..135, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 134..135, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..138, value: Int( 30, @@ -217,7 +211,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 145..149, }, ), @@ -226,32 +220,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..226, is_async: false, decorator_list: [], name: Identifier { id: Name("positional_parameters_with_default_values2"), range: 156..198, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 198..216, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 199..200, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 199..200, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 199..200, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -259,21 +251,21 @@ Module( }, ParameterWithDefault { range: 202..206, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 202..203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 202..203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..206, value: Int( 20, @@ -286,21 +278,21 @@ Module( args: [ ParameterWithDefault { range: 211..215, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 211..212, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 211..212, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..215, value: Int( 30, @@ -318,7 +310,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..226, }, ), @@ -327,32 +319,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 229..296, is_async: false, decorator_list: [], name: Identifier { id: Name("positional_only_and_positional_parameters"), range: 233..274, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 274..286, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 275..276, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 275..276, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 275..276, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -362,14 +352,14 @@ Module( args: [ ParameterWithDefault { range: 281..282, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 281..282, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 281..282, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -377,14 +367,14 @@ Module( }, ParameterWithDefault { range: 284..285, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 284..285, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 284..285, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -399,7 +389,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 292..296, }, ), @@ -408,32 +398,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 299..393, is_async: false, decorator_list: [], name: Identifier { id: Name("pos_args_with_defaults_and_varargs_and_kwargs"), range: 303..348, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 348..383, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 349..350, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 349..350, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 349..350, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -441,21 +429,21 @@ Module( }, ParameterWithDefault { range: 352..356, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 352..353, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 352..353, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 354..356, value: Int( 20, @@ -468,21 +456,21 @@ Module( args: [ ParameterWithDefault { range: 361..365, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 361..362, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 361..362, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 363..365, value: Int( 30, @@ -495,11 +483,11 @@ Module( vararg: Some( Parameter { range: 367..372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 368..372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -508,11 +496,11 @@ Module( kwarg: Some( Parameter { range: 374..382, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 376..382, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -522,7 +510,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 389..393, }, ), @@ -531,35 +519,33 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 396..445, is_async: false, decorator_list: [], name: Identifier { id: Name("keyword_only_parameters"), range: 400..423, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 423..435, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, kwonlyargs: [ ParameterWithDefault { range: 427..428, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 427..428, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 427..428, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -567,14 +553,14 @@ Module( }, ParameterWithDefault { range: 430..431, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 430..431, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 430..431, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -582,14 +568,14 @@ Module( }, ParameterWithDefault { range: 433..434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 433..434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 433..434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -602,7 +588,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 441..445, }, ), @@ -611,35 +597,33 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 448..517, is_async: false, decorator_list: [], name: Identifier { id: Name("keyword_only_parameters_with_defaults"), range: 452..489, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 489..507, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, kwonlyargs: [ ParameterWithDefault { range: 493..494, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 493..494, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 493..494, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -647,21 +631,21 @@ Module( }, ParameterWithDefault { range: 496..500, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 496..497, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 496..497, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 498..500, value: Int( 20, @@ -672,21 +656,21 @@ Module( }, ParameterWithDefault { range: 502..506, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 502..503, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 502..503, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 504..506, value: Int( 30, @@ -702,7 +686,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 513..517, }, ), @@ -711,31 +695,29 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 520..594, is_async: false, decorator_list: [], name: Identifier { id: Name("kw_only_args_with_defaults_and_varargs"), range: 524..562, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 562..584, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 563..568, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 564..568, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -743,14 +725,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 570..571, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 570..571, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 570..571, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -758,21 +740,21 @@ Module( }, ParameterWithDefault { range: 573..577, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 573..574, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 573..574, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 575..577, value: Int( 20, @@ -783,21 +765,21 @@ Module( }, ParameterWithDefault { range: 579..583, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 579..580, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 579..580, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 581..583, value: Int( 30, @@ -813,7 +795,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 590..594, }, ), @@ -822,35 +804,33 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 597..676, is_async: false, decorator_list: [], name: Identifier { id: Name("kw_only_args_with_defaults_and_kwargs"), range: 601..638, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 638..666, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, kwonlyargs: [ ParameterWithDefault { range: 642..643, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 642..643, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 642..643, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -858,21 +838,21 @@ Module( }, ParameterWithDefault { range: 645..649, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 645..646, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 645..646, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 647..649, value: Int( 20, @@ -883,21 +863,21 @@ Module( }, ParameterWithDefault { range: 651..655, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 651..652, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 651..652, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 653..655, value: Int( 30, @@ -910,11 +890,11 @@ Module( kwarg: Some( Parameter { range: 657..665, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 659..665, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -924,7 +904,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 672..676, }, ), @@ -933,31 +913,29 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 679..774, is_async: false, decorator_list: [], name: Identifier { id: Name("kw_only_args_with_defaults_and_varargs_and_kwargs"), range: 683..732, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 732..764, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 733..738, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 734..738, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -965,14 +943,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 740..741, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 740..741, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 740..741, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -980,21 +958,21 @@ Module( }, ParameterWithDefault { range: 743..747, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 743..744, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 743..744, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 745..747, value: Int( 20, @@ -1005,21 +983,21 @@ Module( }, ParameterWithDefault { range: 749..753, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 749..750, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 749..750, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 751..753, value: Int( 30, @@ -1032,11 +1010,11 @@ Module( kwarg: Some( Parameter { range: 755..763, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 757..763, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1046,7 +1024,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 770..774, }, ), @@ -1055,32 +1033,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 777..835, is_async: false, decorator_list: [], name: Identifier { id: Name("pos_and_kw_only_args"), range: 781..801, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 801..825, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 802..803, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 802..803, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 802..803, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1088,14 +1064,14 @@ Module( }, ParameterWithDefault { range: 805..806, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 805..806, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 805..806, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1105,14 +1081,14 @@ Module( args: [ ParameterWithDefault { range: 811..812, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 811..812, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 811..812, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1123,14 +1099,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 817..818, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 817..818, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 817..818, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1138,14 +1114,14 @@ Module( }, ParameterWithDefault { range: 820..821, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 820..821, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 820..821, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1153,14 +1129,14 @@ Module( }, ParameterWithDefault { range: 823..824, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 823..824, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("f"), range: 823..824, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1173,7 +1149,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 831..835, }, ), @@ -1182,32 +1158,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 838..916, is_async: false, decorator_list: [], name: Identifier { id: Name("pos_and_kw_only_args_with_defaults"), range: 842..876, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 876..906, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 877..878, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 877..878, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 877..878, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1215,14 +1189,14 @@ Module( }, ParameterWithDefault { range: 880..881, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 880..881, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 880..881, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1232,14 +1206,14 @@ Module( args: [ ParameterWithDefault { range: 886..887, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 886..887, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 886..887, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1250,14 +1224,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 892..893, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 892..893, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 892..893, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1265,21 +1239,21 @@ Module( }, ParameterWithDefault { range: 895..899, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 895..896, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 895..896, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 897..899, value: Int( 20, @@ -1290,21 +1264,21 @@ Module( }, ParameterWithDefault { range: 901..905, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 901..902, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("f"), range: 901..902, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 903..905, value: Int( 30, @@ -1320,7 +1294,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 912..916, }, ), @@ -1329,32 +1303,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 919..1013, is_async: false, decorator_list: [], name: Identifier { id: Name("pos_and_kw_only_args_with_defaults_and_varargs"), range: 923..969, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 969..1003, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 970..971, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 970..971, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 970..971, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1362,14 +1334,14 @@ Module( }, ParameterWithDefault { range: 973..974, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 973..974, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 973..974, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1379,14 +1351,14 @@ Module( args: [ ParameterWithDefault { range: 979..980, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 979..980, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 979..980, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1396,11 +1368,11 @@ Module( vararg: Some( Parameter { range: 982..987, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 983..987, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1408,14 +1380,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 989..990, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 989..990, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 989..990, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1423,21 +1395,21 @@ Module( }, ParameterWithDefault { range: 992..996, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 992..993, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 992..993, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 994..996, value: Int( 20, @@ -1448,21 +1420,21 @@ Module( }, ParameterWithDefault { range: 998..1002, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 998..999, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("f"), range: 998..999, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1000..1002, value: Int( 30, @@ -1478,7 +1450,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1009..1013, }, ), @@ -1487,32 +1459,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1016..1121, is_async: false, decorator_list: [], name: Identifier { id: Name("pos_and_kw_only_args_with_defaults_and_kwargs"), range: 1020..1065, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 1065..1111, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 1071..1072, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1071..1072, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 1071..1072, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1520,14 +1490,14 @@ Module( }, ParameterWithDefault { range: 1074..1075, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1074..1075, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 1074..1075, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1537,14 +1507,14 @@ Module( args: [ ParameterWithDefault { range: 1080..1081, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1080..1081, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 1080..1081, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1555,14 +1525,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 1086..1087, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1086..1087, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 1086..1087, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1570,21 +1540,21 @@ Module( }, ParameterWithDefault { range: 1089..1093, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1089..1090, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 1089..1090, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1091..1093, value: Int( 20, @@ -1595,21 +1565,21 @@ Module( }, ParameterWithDefault { range: 1095..1099, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1095..1096, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("f"), range: 1095..1096, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1097..1099, value: Int( 30, @@ -1622,11 +1592,11 @@ Module( kwarg: Some( Parameter { range: 1101..1109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 1103..1109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1636,7 +1606,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1117..1121, }, ), @@ -1645,32 +1615,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1124..1245, is_async: false, decorator_list: [], name: Identifier { id: Name("pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs"), range: 1128..1185, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 1185..1235, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 1191..1192, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1191..1192, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 1191..1192, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1678,14 +1646,14 @@ Module( }, ParameterWithDefault { range: 1194..1195, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1194..1195, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 1194..1195, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1695,14 +1663,14 @@ Module( args: [ ParameterWithDefault { range: 1200..1201, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1200..1201, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 1200..1201, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1712,11 +1680,11 @@ Module( vararg: Some( Parameter { range: 1203..1208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 1204..1208, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1724,14 +1692,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 1210..1211, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1210..1211, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 1210..1211, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1739,21 +1707,21 @@ Module( }, ParameterWithDefault { range: 1213..1217, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1213..1214, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 1213..1214, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1215..1217, value: Int( 20, @@ -1764,21 +1732,21 @@ Module( }, ParameterWithDefault { range: 1219..1223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1219..1220, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("f"), range: 1219..1220, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1221..1223, value: Int( 30, @@ -1791,11 +1759,11 @@ Module( kwarg: Some( Parameter { range: 1225..1233, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 1227..1233, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1805,7 +1773,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1241..1245, }, ), @@ -1814,33 +1782,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1248..1316, is_async: false, decorator_list: [], name: Identifier { id: Name("positional_and_keyword_parameters"), range: 1252..1285, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 1285..1306, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 1286..1287, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1286..1287, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 1286..1287, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1848,14 +1814,14 @@ Module( }, ParameterWithDefault { range: 1289..1290, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1289..1290, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 1289..1290, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1863,14 +1829,14 @@ Module( }, ParameterWithDefault { range: 1292..1293, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1292..1293, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 1292..1293, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1881,14 +1847,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 1298..1299, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1298..1299, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 1298..1299, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1896,14 +1862,14 @@ Module( }, ParameterWithDefault { range: 1301..1302, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1301..1302, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 1301..1302, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1911,14 +1877,14 @@ Module( }, ParameterWithDefault { range: 1304..1305, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1304..1305, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("f"), range: 1304..1305, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1931,7 +1897,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1312..1316, }, ), @@ -1940,33 +1906,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1319..1407, is_async: false, decorator_list: [], name: Identifier { id: Name("positional_and_keyword_parameters_with_defaults"), range: 1323..1370, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 1370..1397, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 1371..1372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1371..1372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 1371..1372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1974,14 +1938,14 @@ Module( }, ParameterWithDefault { range: 1374..1375, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1374..1375, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 1374..1375, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1989,14 +1953,14 @@ Module( }, ParameterWithDefault { range: 1377..1378, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1377..1378, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 1377..1378, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2007,14 +1971,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 1383..1384, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1383..1384, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 1383..1384, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2022,21 +1986,21 @@ Module( }, ParameterWithDefault { range: 1386..1390, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1386..1387, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 1386..1387, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1388..1390, value: Int( 20, @@ -2047,21 +2011,21 @@ Module( }, ParameterWithDefault { range: 1392..1396, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1392..1393, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("f"), range: 1392..1393, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1394..1396, value: Int( 30, @@ -2077,7 +2041,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1403..1407, }, ), @@ -2086,33 +2050,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1410..1520, is_async: false, decorator_list: [], name: Identifier { id: Name("positional_and_keyword_parameters_with_defaults_and_varargs"), range: 1414..1473, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 1473..1510, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 1479..1480, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1479..1480, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 1479..1480, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2120,14 +2082,14 @@ Module( }, ParameterWithDefault { range: 1482..1483, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1482..1483, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 1482..1483, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2135,14 +2097,14 @@ Module( }, ParameterWithDefault { range: 1485..1486, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1485..1486, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 1485..1486, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2152,11 +2114,11 @@ Module( vararg: Some( Parameter { range: 1488..1493, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 1489..1493, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2164,14 +2126,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 1495..1496, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1495..1496, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 1495..1496, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2179,21 +2141,21 @@ Module( }, ParameterWithDefault { range: 1498..1502, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1498..1499, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 1498..1499, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1500..1502, value: Int( 20, @@ -2204,21 +2166,21 @@ Module( }, ParameterWithDefault { range: 1504..1508, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1504..1505, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("f"), range: 1504..1505, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1506..1508, value: Int( 30, @@ -2234,7 +2196,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1516..1520, }, ), @@ -2243,33 +2205,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1523..1654, is_async: false, decorator_list: [], name: Identifier { id: Name("positional_and_keyword_parameters_with_defaults_and_varargs_and_kwargs"), range: 1527..1597, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 1597..1644, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 1603..1604, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1603..1604, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 1603..1604, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2277,14 +2237,14 @@ Module( }, ParameterWithDefault { range: 1606..1607, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1606..1607, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 1606..1607, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2292,14 +2252,14 @@ Module( }, ParameterWithDefault { range: 1609..1610, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1609..1610, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 1609..1610, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2309,11 +2269,11 @@ Module( vararg: Some( Parameter { range: 1612..1617, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 1613..1617, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2321,14 +2281,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 1619..1620, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1619..1620, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("d"), range: 1619..1620, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2336,21 +2296,21 @@ Module( }, ParameterWithDefault { range: 1622..1626, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1622..1623, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("e"), range: 1622..1623, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1624..1626, value: Int( 20, @@ -2361,21 +2321,21 @@ Module( }, ParameterWithDefault { range: 1628..1632, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1628..1629, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("f"), range: 1628..1629, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1630..1632, value: Int( 30, @@ -2388,11 +2348,11 @@ Module( kwarg: Some( Parameter { range: 1634..1642, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 1636..1642, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2402,7 +2362,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1650..1654, }, ), @@ -2411,28 +2371,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1703..1735, is_async: false, decorator_list: [], name: Identifier { id: Name("func"), range: 1707..1711, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 1711..1714, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 1712..1713, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 1712..1713, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -2443,26 +2403,24 @@ Module( ), parameters: Parameters { range: 1714..1720, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 1715..1719, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1715..1719, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 1715..1716, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1718..1719, id: Name("T"), ctx: Load, @@ -2480,7 +2438,7 @@ Module( returns: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1724..1725, id: Name("T"), ctx: Load, @@ -2490,7 +2448,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1731..1735, }, ), @@ -2499,33 +2457,33 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1738..1775, is_async: false, decorator_list: [], name: Identifier { id: Name("func"), range: 1742..1746, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 1746..1754, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 1747..1753, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 1747..1748, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1750..1753, id: Name("str"), ctx: Load, @@ -2540,26 +2498,24 @@ Module( ), parameters: Parameters { range: 1754..1760, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 1755..1759, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1755..1759, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 1755..1756, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1758..1759, id: Name("T"), ctx: Load, @@ -2577,7 +2533,7 @@ Module( returns: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1764..1765, id: Name("T"), ctx: Load, @@ -2587,7 +2543,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1771..1775, }, ), @@ -2596,38 +2552,38 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1778..1824, is_async: false, decorator_list: [], name: Identifier { id: Name("func"), range: 1782..1786, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 1786..1803, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 1787..1802, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 1787..1788, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1790..1802, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1791..1794, id: Name("str"), ctx: Load, @@ -2635,7 +2591,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1796..1801, id: Name("bytes"), ctx: Load, @@ -2655,26 +2611,24 @@ Module( ), parameters: Parameters { range: 1803..1809, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 1804..1808, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1804..1808, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 1804..1805, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1807..1808, id: Name("T"), ctx: Load, @@ -2692,7 +2646,7 @@ Module( returns: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1813..1814, id: Name("T"), ctx: Load, @@ -2702,7 +2656,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1820..1824, }, ), @@ -2711,28 +2665,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1827..1873, is_async: false, decorator_list: [], name: Identifier { id: Name("func"), range: 1831..1835, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 1835..1840, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 1836..1839, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 1837..1839, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -2742,28 +2696,26 @@ Module( ), parameters: Parameters { range: 1840..1849, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 1841..1848, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 1842..1843, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1845..1848, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1846..1848, id: Name("Ts"), ctx: Load, @@ -2781,11 +2733,11 @@ Module( returns: Some( Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1853..1863, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1853..1858, id: Name("Tuple"), ctx: Load, @@ -2793,16 +2745,16 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1859..1862, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1859..1862, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1860..1862, id: Name("Ts"), ctx: Load, @@ -2823,7 +2775,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1869..1873, }, ), @@ -2832,28 +2784,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1876..1934, is_async: false, decorator_list: [], name: Identifier { id: Name("func"), range: 1880..1884, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 1884..1889, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 1885..1888, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 1887..1888, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -2863,28 +2815,26 @@ Module( ), parameters: Parameters { range: 1889..1924, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 1890..1903, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 1891..1895, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1897..1903, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1897..1898, id: Name("P"), ctx: Load, @@ -2893,7 +2843,7 @@ Module( attr: Identifier { id: Name("args"), range: 1899..1903, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -2905,20 +2855,20 @@ Module( kwarg: Some( Parameter { range: 1905..1923, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 1907..1913, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1915..1923, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1915..1916, id: Name("P"), ctx: Load, @@ -2927,7 +2877,7 @@ Module( attr: Identifier { id: Name("kwargs"), range: 1917..1923, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -2940,7 +2890,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1930..1934, }, ), @@ -2949,28 +2899,28 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1937..1978, is_async: false, decorator_list: [], name: Identifier { id: Name("func"), range: 1941..1945, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 1945..1966, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 1946..1947, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 1946..1947, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -2979,16 +2929,16 @@ Module( TypeVar( TypeParamTypeVar { range: 1949..1955, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("U"), range: 1949..1950, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1952..1955, id: Name("str"), ctx: Load, @@ -3001,11 +2951,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 1957..1960, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 1958..1960, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -3013,11 +2963,11 @@ Module( ParamSpec( TypeParamParamSpec { range: 1962..1965, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 1964..1965, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -3027,9 +2977,7 @@ Module( ), parameters: Parameters { range: 1966..1968, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -3040,7 +2988,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1974..1978, }, ), @@ -3049,21 +2997,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1981..2000, is_async: false, decorator_list: [], name: Identifier { id: Name("ellipsis"), range: 1985..1993, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 1993..1995, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -3074,11 +3020,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1997..2000, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1997..2000, }, ), @@ -3089,21 +3035,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2003..2064, is_async: false, decorator_list: [], name: Identifier { id: Name("multiple_statements"), range: 2007..2026, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 2026..2028, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -3113,7 +3057,7 @@ Module( returns: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2032..2035, id: Name("int"), ctx: Load, @@ -3123,15 +3067,15 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2041..2047, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2041..2047, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2041..2045, id: Name("call"), ctx: Load, @@ -3139,7 +3083,7 @@ Module( ), arguments: Arguments { range: 2045..2047, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -3149,17 +3093,17 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2052..2056, }, ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2061..2064, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2061..2064, }, ), @@ -3170,31 +3114,29 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2067..2091, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 2071..2074, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 2074..2081, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 2075..2080, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 2076..2080, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3206,7 +3148,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2087..2091, }, ), @@ -3215,21 +3157,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2094..2121, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 2098..2101, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 2101..2111, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -3237,11 +3177,11 @@ Module( kwarg: Some( Parameter { range: 2102..2110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 2104..2110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3251,7 +3191,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2117..2121, }, ), @@ -3260,31 +3200,29 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2124..2158, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 2128..2131, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 2131..2148, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: Some( Parameter { range: 2132..2137, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("args"), range: 2133..2137, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3293,11 +3231,11 @@ Module( kwarg: Some( Parameter { range: 2139..2147, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kwargs"), range: 2141..2147, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3307,7 +3245,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2154..2158, }, ), @@ -3316,32 +3254,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2161..2184, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 2165..2168, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 2168..2174, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 2169..2170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2169..2170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 2169..2170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3357,7 +3293,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2180..2184, }, ), @@ -3366,32 +3302,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2187..2213, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 2191..2194, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 2194..2203, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 2195..2196, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2195..2196, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 2195..2196, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3401,14 +3335,14 @@ Module( args: [ ParameterWithDefault { range: 2201..2202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2201..2202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 2201..2202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3423,7 +3357,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2209..2213, }, ), @@ -3432,39 +3366,37 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2216..2242, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 2220..2223, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 2223..2232, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 2224..2227, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2224..2225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 2224..2225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2226..2227, value: Int( 1, @@ -3483,7 +3415,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2238..2242, }, ), @@ -3492,32 +3424,30 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2245..2277, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 2249..2252, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 2252..2267, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [ ParameterWithDefault { range: 2253..2254, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2253..2254, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 2253..2254, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3525,14 +3455,14 @@ Module( }, ParameterWithDefault { range: 2256..2257, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2256..2257, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 2256..2257, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3544,14 +3474,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 2265..2266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2265..2266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 2265..2266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3564,7 +3494,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2273..2277, }, ), @@ -3573,40 +3503,38 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2280..2309, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 2284..2287, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 2287..2299, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 2288..2292, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2288..2290, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("kw"), range: 2288..2290, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2291..2292, value: Int( 1, @@ -3620,14 +3548,14 @@ Module( kwonlyargs: [ ParameterWithDefault { range: 2297..2298, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2297..2298, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 2297..2298, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3640,7 +3568,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2305..2309, }, ), @@ -3649,38 +3577,36 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2312..2357, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 2316..2319, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 2319..2347, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 2320..2326, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2320..2326, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 2320..2321, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2323..2326, id: Name("int"), ctx: Load, @@ -3692,25 +3618,25 @@ Module( }, ParameterWithDefault { range: 2328..2336, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2328..2336, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("y"), range: 2328..2329, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2331..2336, value: StringLiteralValue { inner: Single( StringLiteral { range: 2331..2336, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "str", flags: StringLiteralFlags { quote_style: Double, @@ -3728,23 +3654,23 @@ Module( }, ParameterWithDefault { range: 2338..2346, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2338..2346, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("z"), range: 2338..2339, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2341..2346, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2341..2342, value: Int( 1, @@ -3754,7 +3680,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2345..2346, value: Int( 2, @@ -3776,7 +3702,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2353..2357, }, ), @@ -3785,33 +3711,31 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2360..2398, is_async: false, decorator_list: [], name: Identifier { id: Name("foo"), range: 2364..2367, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 2367..2388, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 2368..2372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2368..2372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("self"), range: 2368..2372, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3819,21 +3743,21 @@ Module( }, ParameterWithDefault { range: 2374..2377, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2374..2375, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 2374..2375, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2376..2377, value: Int( 1, @@ -3844,21 +3768,21 @@ Module( }, ParameterWithDefault { range: 2379..2382, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2379..2380, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 2379..2380, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2381..2382, value: Int( 2, @@ -3869,21 +3793,21 @@ Module( }, ParameterWithDefault { range: 2384..2387, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 2384..2385, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 2384..2385, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, default: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2386..2387, value: Int( 3, @@ -3901,7 +3825,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2394..2398, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap index 51edcda294..8a4b8262da 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/if.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..375, body: [ If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, test: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3..4, value: Int( 1, @@ -26,11 +26,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..8, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..8, value: Int( 10, @@ -43,11 +43,11 @@ Module( elif_else_clauses: [ ElifElseClause { range: 9..19, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, value: Int( 2, @@ -58,11 +58,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..19, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 17..19, value: Int( 20, @@ -75,16 +75,16 @@ Module( }, ElifElseClause { range: 20..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..28, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 26..28, value: Int( 30, @@ -100,11 +100,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..52, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 33..37, value: true, }, @@ -112,11 +112,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, value: Int( 1, @@ -127,11 +127,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..52, }, ), @@ -143,15 +143,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..85, test: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..61, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("x"), ctx: Load, @@ -163,7 +163,7 @@ Module( comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 60..61, value: Int( 1, @@ -176,11 +176,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..70, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..70, }, ), @@ -190,12 +190,12 @@ Module( elif_else_clauses: [ ElifElseClause { range: 71..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..85, }, ), @@ -206,11 +206,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..117, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("a"), ctx: Load, @@ -219,7 +219,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 97..101, }, ), @@ -227,11 +227,11 @@ Module( elif_else_clauses: [ ElifElseClause { range: 102..117, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..108, id: Name("b"), ctx: Load, @@ -241,11 +241,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..117, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 114..117, }, ), @@ -258,17 +258,17 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 119..203, test: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..129, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, id: Name("a"), ctx: Load, @@ -276,7 +276,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, id: Name("b"), ctx: Load, @@ -288,11 +288,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..138, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..138, }, ), @@ -302,11 +302,11 @@ Module( elif_else_clauses: [ ElifElseClause { range: 139..157, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..148, value: true, }, @@ -315,11 +315,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..157, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..157, }, ), @@ -329,11 +329,11 @@ Module( }, ElifElseClause { range: 158..173, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..164, id: Name("c"), ctx: Load, @@ -343,11 +343,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..173, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..173, }, ), @@ -357,11 +357,11 @@ Module( }, ElifElseClause { range: 174..189, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..180, id: Name("d"), ctx: Load, @@ -371,11 +371,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..189, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..189, }, ), @@ -385,20 +385,20 @@ Module( }, ElifElseClause { range: 190..203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..203, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..203, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..201, id: Name("f"), ctx: Load, @@ -406,7 +406,7 @@ Module( ), arguments: Arguments { range: 201..203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -421,15 +421,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 229..260, test: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..238, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..233, id: Name("a"), ctx: Store, @@ -437,7 +437,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 237..238, id: Name("b"), ctx: Load, @@ -448,11 +448,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..243, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 240..243, }, ), @@ -462,15 +462,15 @@ Module( elif_else_clauses: [ ElifElseClause { range: 244..260, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 249..255, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 249..250, id: Name("a"), ctx: Store, @@ -478,7 +478,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..255, id: Name("b"), ctx: Load, @@ -490,11 +490,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 257..260, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 257..260, }, ), @@ -507,30 +507,28 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 261..302, test: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 264..275, parameters: Some( Parameters { range: 271..272, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 271..272, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 271..272, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 271..272, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -544,7 +542,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 274..275, id: Name("x"), ctx: Load, @@ -555,11 +553,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 277..280, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 277..280, }, ), @@ -569,30 +567,28 @@ Module( elif_else_clauses: [ ElifElseClause { range: 281..302, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..297, parameters: Some( Parameters { range: 293..294, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 293..294, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 293..294, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 293..294, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -606,7 +602,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 296..297, id: Name("x"), ctx: Load, @@ -618,11 +614,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 299..302, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 299..302, }, ), @@ -635,15 +631,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 303..336, test: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 306..313, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..313, id: Name("x"), ctx: Load, @@ -654,11 +650,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 315..318, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 315..318, }, ), @@ -668,15 +664,15 @@ Module( elif_else_clauses: [ ElifElseClause { range: 319..336, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..331, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 330..331, id: Name("x"), ctx: Load, @@ -688,11 +684,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 333..336, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 333..336, }, ), @@ -705,16 +701,16 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 337..374, test: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 341..348, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 347..348, id: Name("x"), ctx: Load, @@ -726,11 +722,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..354, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..354, }, ), @@ -740,16 +736,16 @@ Module( elif_else_clauses: [ ElifElseClause { range: 355..374, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 361..368, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 367..368, id: Name("x"), ctx: Load, @@ -762,11 +758,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 371..374, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 371..374, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap index 4d4d08b963..56388f8862 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/statement/import.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..92, body: [ Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..8, names: [ Alias { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -30,16 +30,16 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..21, names: [ Alias { range: 16..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a.b.c"), range: 16..21, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -48,22 +48,22 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..39, names: [ Alias { range: 29..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a.b.c"), range: 29..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("d"), range: 38..39, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -72,36 +72,36 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 40..54, names: [ Alias { range: 47..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a"), range: 47..48, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 50..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("b"), range: 50..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, Alias { range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("c"), range: 53..54, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: None, }, @@ -110,38 +110,38 @@ Module( ), Import( StmtImport { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..91, names: [ Alias { range: 62..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("foo.bar"), range: 62..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("a"), range: 73..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, Alias { range: 76..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("a.b.c.d"), range: 76..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, asname: Some( Identifier { id: Name("abcd"), range: 87..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap index 1a7192474d..f98896f399 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/match.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..5770, body: [ Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..103, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..74, id: Name("x"), ctx: Load, @@ -25,19 +25,19 @@ Module( cases: [ MatchCase { range: 80..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 85..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..88, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..88, value: Complex { real: 0.0, @@ -53,12 +53,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..103, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 98..99, id: Name("y"), ctx: Store, @@ -67,7 +67,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 102..103, value: Int( 0, @@ -83,11 +83,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 126..167, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, id: Name("x"), ctx: Load, @@ -96,14 +96,14 @@ Module( cases: [ MatchCase { range: 139..167, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 144..152, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..149, id: Name("bytes"), ctx: Load, @@ -111,18 +111,18 @@ Module( ), arguments: PatternArguments { range: 149..152, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 150..151, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("z"), range: 150..151, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -136,12 +136,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..167, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 162..163, id: Name("y"), ctx: Store, @@ -150,7 +150,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 166..167, value: Int( 0, @@ -166,11 +166,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 190..260, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 196..197, id: Name("x"), ctx: Load, @@ -179,14 +179,14 @@ Module( cases: [ MatchCase { range: 203..229, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 208..209, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 208..209, value: Int( 0, @@ -198,7 +198,7 @@ Module( guard: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..214, value: Int( 0, @@ -209,12 +209,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..229, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 224..225, id: Name("y"), ctx: Store, @@ -223,7 +223,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..229, value: Int( 0, @@ -236,14 +236,14 @@ Module( }, MatchCase { range: 234..260, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 239..240, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..240, value: Int( 0, @@ -255,7 +255,7 @@ Module( guard: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 244..245, value: Int( 1, @@ -266,12 +266,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..260, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..256, id: Name("y"), ctx: Store, @@ -280,7 +280,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..260, value: Int( 1, @@ -296,11 +296,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 283..332, subject: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 289..290, value: Int( 3, @@ -310,19 +310,19 @@ Module( cases: [ MatchCase { range: 296..332, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 301..314, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 301..302, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..302, value: Int( 0, @@ -334,10 +334,10 @@ Module( MatchValue( PatternMatchValue { range: 305..306, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 305..306, value: Int( 1, @@ -349,10 +349,10 @@ Module( MatchValue( PatternMatchValue { range: 309..310, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 309..310, value: Int( 2, @@ -364,10 +364,10 @@ Module( MatchValue( PatternMatchValue { range: 313..314, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..314, value: Int( 3, @@ -383,12 +383,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..332, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 324..325, id: Name("x"), ctx: Store, @@ -397,7 +397,7 @@ Module( ], value: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 328..332, value: true, }, @@ -411,11 +411,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 355..403, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 361..362, id: Name("x"), ctx: Load, @@ -424,24 +424,24 @@ Module( cases: [ MatchCase { range: 368..403, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 373..388, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchSequence( PatternMatchSequence { range: 373..379, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 374..375, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 374..375, value: Int( 0, @@ -453,10 +453,10 @@ Module( MatchValue( PatternMatchValue { range: 377..378, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 377..378, value: Int( 1, @@ -471,15 +471,15 @@ Module( MatchSequence( PatternMatchSequence { range: 382..388, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 383..384, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 383..384, value: Int( 1, @@ -491,10 +491,10 @@ Module( MatchValue( PatternMatchValue { range: 386..387, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 386..387, value: Int( 0, @@ -513,12 +513,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 398..403, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 398..399, id: Name("y"), ctx: Store, @@ -527,7 +527,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 402..403, value: Int( 0, @@ -543,11 +543,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 445..523, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 451..452, id: Name("x"), ctx: Load, @@ -556,16 +556,16 @@ Module( cases: [ MatchCase { range: 458..489, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 463..467, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchStar( PatternMatchStar { range: 464..466, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: None, }, ), @@ -576,18 +576,18 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 477..489, value: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 484..489, value: StringLiteralValue { inner: Single( StringLiteral { range: 484..489, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "seq", flags: StringLiteralFlags { quote_style: Double, @@ -606,11 +606,11 @@ Module( }, MatchCase { range: 494..523, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 499..501, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: None, @@ -620,18 +620,18 @@ Module( body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 511..523, value: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 518..523, value: StringLiteralValue { inner: Single( StringLiteral { range: 518..523, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "map", flags: StringLiteralFlags { quote_style: Double, @@ -653,11 +653,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 546..714, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 552..553, id: Name("x"), ctx: Load, @@ -666,15 +666,15 @@ Module( cases: [ MatchCase { range: 559..594, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 564..579, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 565..566, value: Int( 0, @@ -686,15 +686,15 @@ Module( MatchSequence( PatternMatchSequence { range: 568..578, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 569..570, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 569..570, value: Int( 1, @@ -706,10 +706,10 @@ Module( MatchValue( PatternMatchValue { range: 572..573, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 572..573, value: Int( 2, @@ -721,7 +721,7 @@ Module( MatchMapping( PatternMatchMapping { range: 575..577, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: None, @@ -738,12 +738,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 589..594, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 589..590, id: Name("y"), ctx: Store, @@ -752,7 +752,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 593..594, value: Int( 0, @@ -765,20 +765,20 @@ Module( }, MatchCase { range: 599..687, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 604..672, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchMapping( PatternMatchMapping { range: 604..626, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 605..606, value: Int( 0, @@ -790,20 +790,20 @@ Module( MatchOr( PatternMatchOr { range: 608..625, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchSequence( PatternMatchSequence { range: 608..618, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 609..610, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 609..610, value: Int( 1, @@ -815,10 +815,10 @@ Module( MatchValue( PatternMatchValue { range: 612..613, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 612..613, value: Int( 2, @@ -830,7 +830,7 @@ Module( MatchMapping( PatternMatchMapping { range: 615..617, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: None, @@ -842,7 +842,7 @@ Module( MatchSingleton( PatternMatchSingleton { range: 621..625, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: True, }, ), @@ -856,11 +856,11 @@ Module( MatchMapping( PatternMatchMapping { range: 629..638, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 630..631, value: Int( 1, @@ -872,12 +872,12 @@ Module( MatchSequence( PatternMatchSequence { range: 633..637, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchSequence( PatternMatchSequence { range: 634..636, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], }, ), @@ -891,11 +891,11 @@ Module( MatchMapping( PatternMatchMapping { range: 641..656, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 642..643, value: Int( 0, @@ -907,15 +907,15 @@ Module( MatchSequence( PatternMatchSequence { range: 645..655, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 646..647, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 646..647, value: Int( 1, @@ -927,10 +927,10 @@ Module( MatchValue( PatternMatchValue { range: 649..650, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 649..650, value: Int( 2, @@ -942,7 +942,7 @@ Module( MatchMapping( PatternMatchMapping { range: 652..654, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: None, @@ -958,23 +958,23 @@ Module( MatchSequence( PatternMatchSequence { range: 659..661, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], }, ), MatchValue( PatternMatchValue { range: 664..667, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 664..667, value: StringLiteralValue { inner: Single( StringLiteral { range: 664..667, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "X", flags: StringLiteralFlags { quote_style: Double, @@ -991,7 +991,7 @@ Module( MatchMapping( PatternMatchMapping { range: 670..672, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: None, @@ -1004,12 +1004,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 682..687, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 682..683, id: Name("y"), ctx: Store, @@ -1018,7 +1018,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 686..687, value: Int( 1, @@ -1031,11 +1031,11 @@ Module( }, MatchCase { range: 692..714, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 697..699, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], }, ), @@ -1043,12 +1043,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 709..714, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 709..710, id: Name("y"), ctx: Store, @@ -1057,7 +1057,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 713..714, value: Int( 2, @@ -1073,11 +1073,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 737..782, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 743..744, id: Name("x"), ctx: Load, @@ -1086,18 +1086,18 @@ Module( cases: [ MatchCase { range: 750..782, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 755..767, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 755..767, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 755..759, value: Float( 0.25, @@ -1107,7 +1107,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 762..767, value: Complex { real: 0.0, @@ -1123,12 +1123,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 777..782, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 777..778, id: Name("y"), ctx: Store, @@ -1137,7 +1137,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 781..782, value: Int( 0, @@ -1153,11 +1153,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 805..841, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 811..812, id: Name("x"), ctx: Load, @@ -1166,19 +1166,19 @@ Module( cases: [ MatchCase { range: 818..841, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 823..826, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 823..826, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 824..826, value: Complex { real: 0.0, @@ -1194,12 +1194,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 836..841, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 836..837, id: Name("y"), ctx: Store, @@ -1208,7 +1208,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 840..841, value: Int( 0, @@ -1224,11 +1224,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 864..913, subject: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 870..871, value: Int( 4, @@ -1238,19 +1238,19 @@ Module( cases: [ MatchCase { range: 877..913, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 882..895, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 882..883, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 882..883, value: Int( 0, @@ -1262,10 +1262,10 @@ Module( MatchValue( PatternMatchValue { range: 886..887, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 886..887, value: Int( 1, @@ -1277,10 +1277,10 @@ Module( MatchValue( PatternMatchValue { range: 890..891, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 890..891, value: Int( 2, @@ -1292,10 +1292,10 @@ Module( MatchValue( PatternMatchValue { range: 894..895, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 894..895, value: Int( 3, @@ -1311,12 +1311,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 905..913, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 905..906, id: Name("x"), ctx: Store, @@ -1325,7 +1325,7 @@ Module( ], value: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 909..913, value: true, }, @@ -1339,11 +1339,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 936..975, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 942..943, id: Name("x"), ctx: Load, @@ -1352,14 +1352,14 @@ Module( cases: [ MatchCase { range: 949..975, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 954..955, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 954..955, value: Int( 0, @@ -1371,7 +1371,7 @@ Module( guard: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 959..960, id: Name("x"), ctx: Load, @@ -1381,12 +1381,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 970..975, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 970..971, id: Name("y"), ctx: Store, @@ -1395,7 +1395,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 974..975, value: Int( 0, @@ -1411,11 +1411,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 998..1098, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1004..1005, id: Name("x"), ctx: Load, @@ -1424,15 +1424,15 @@ Module( cases: [ MatchCase { range: 1011..1037, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 1016..1022, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1017..1018, value: Int( 1, @@ -1444,10 +1444,10 @@ Module( MatchValue( PatternMatchValue { range: 1020..1021, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1020..1021, value: Int( 0, @@ -1464,12 +1464,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1032..1037, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1032..1033, id: Name("y"), ctx: Store, @@ -1478,7 +1478,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1036..1037, value: Int( 0, @@ -1491,15 +1491,15 @@ Module( }, MatchCase { range: 1042..1068, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 1047..1053, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1048..1049, value: Int( 0, @@ -1511,10 +1511,10 @@ Module( MatchValue( PatternMatchValue { range: 1051..1052, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1051..1052, value: Int( 0, @@ -1531,12 +1531,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1063..1068, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1063..1064, id: Name("y"), ctx: Store, @@ -1545,7 +1545,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1067..1068, value: Int( 1, @@ -1558,18 +1558,18 @@ Module( }, MatchCase { range: 1073..1098, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 1078..1083, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: Some( Identifier { id: Name("z"), range: 1081..1082, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -1578,12 +1578,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1093..1098, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1093..1094, id: Name("y"), ctx: Store, @@ -1592,7 +1592,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1097..1098, value: Int( 2, @@ -1608,15 +1608,15 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1121..1162, subject: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1127..1132, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1127..1130, id: Name("Seq"), ctx: Load, @@ -1624,7 +1624,7 @@ Module( ), arguments: Arguments { range: 1130..1132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -1633,16 +1633,16 @@ Module( cases: [ MatchCase { range: 1138..1162, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 1143..1147, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchStar( PatternMatchStar { range: 1144..1146, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: None, }, ), @@ -1653,12 +1653,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1157..1162, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1157..1158, id: Name("y"), ctx: Store, @@ -1667,7 +1667,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1161..1162, value: Int( 0, @@ -1683,11 +1683,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1185..1245, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1191..1192, id: Name("x"), ctx: Load, @@ -1696,14 +1696,14 @@ Module( cases: [ MatchCase { range: 1198..1219, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 1203..1204, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1203..1204, value: Int( 1, @@ -1716,12 +1716,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1214..1219, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1214..1215, id: Name("y"), ctx: Store, @@ -1730,7 +1730,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1218..1219, value: Int( 0, @@ -1743,14 +1743,14 @@ Module( }, MatchCase { range: 1224..1245, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 1229..1230, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1229..1230, value: Int( 1, @@ -1763,12 +1763,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1240..1245, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1240..1241, id: Name("y"), ctx: Store, @@ -1777,7 +1777,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1244..1245, value: Int( 1, @@ -1793,11 +1793,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1268..1315, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1274..1275, id: Name("x"), ctx: Load, @@ -1806,21 +1806,21 @@ Module( cases: [ MatchCase { range: 1281..1315, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 1286..1298, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1287..1292, value: StringLiteralValue { inner: Single( StringLiteral { range: 1287..1292, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "foo", flags: StringLiteralFlags { quote_style: Double, @@ -1837,13 +1837,13 @@ Module( MatchAs( PatternMatchAs { range: 1294..1297, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("bar"), range: 1294..1297, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -1856,12 +1856,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1308..1315, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1308..1309, id: Name("y"), ctx: Store, @@ -1870,7 +1870,7 @@ Module( ], value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1312..1315, id: Name("bar"), ctx: Load, @@ -1885,16 +1885,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1338..1392, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1344..1353, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1345..1346, value: Int( 0, @@ -1903,7 +1903,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1348..1349, value: Int( 1, @@ -1912,7 +1912,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1351..1352, value: Int( 2, @@ -1927,19 +1927,19 @@ Module( cases: [ MatchCase { range: 1359..1392, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 1364..1377, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 1365..1366, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1365..1366, value: Int( 0, @@ -1951,10 +1951,10 @@ Module( MatchValue( PatternMatchValue { range: 1368..1369, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1368..1369, value: Int( 1, @@ -1966,12 +1966,12 @@ Module( MatchStar( PatternMatchStar { range: 1371..1373, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Some( Identifier { id: Name("x"), range: 1372..1373, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -1979,10 +1979,10 @@ Module( MatchValue( PatternMatchValue { range: 1375..1376, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1375..1376, value: Int( 2, @@ -1998,12 +1998,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1387..1392, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1387..1388, id: Name("y"), ctx: Store, @@ -2012,7 +2012,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1391..1392, value: Int( 0, @@ -2028,11 +2028,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1415..1529, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1421..1422, id: Name("x"), ctx: Load, @@ -2041,19 +2041,19 @@ Module( cases: [ MatchCase { range: 1428..1451, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 1433..1436, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 1434..1435, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1434..1435, value: Int( 0, @@ -2069,12 +2069,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1446..1451, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1446..1447, id: Name("y"), ctx: Store, @@ -2083,7 +2083,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1450..1451, value: Int( 0, @@ -2096,19 +2096,19 @@ Module( }, MatchCase { range: 1456..1498, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 1461..1467, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 1462..1463, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1462..1463, value: Int( 1, @@ -2120,10 +2120,10 @@ Module( MatchValue( PatternMatchValue { range: 1465..1466, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1465..1466, value: Int( 0, @@ -2138,11 +2138,11 @@ Module( guard: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1472..1482, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1472..1473, id: Name("x"), ctx: Store, @@ -2150,11 +2150,11 @@ Module( ), value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1477..1482, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1477..1478, id: Name("x"), ctx: Load, @@ -2162,13 +2162,13 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1479..1481, lower: None, upper: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1480..1481, value: Int( 0, @@ -2188,12 +2188,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1493..1498, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1493..1494, id: Name("y"), ctx: Store, @@ -2202,7 +2202,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1497..1498, value: Int( 1, @@ -2215,19 +2215,19 @@ Module( }, MatchCase { range: 1503..1529, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 1508..1514, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 1509..1510, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1509..1510, value: Int( 1, @@ -2239,10 +2239,10 @@ Module( MatchValue( PatternMatchValue { range: 1512..1513, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1512..1513, value: Int( 0, @@ -2258,12 +2258,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1524..1529, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1524..1525, id: Name("y"), ctx: Store, @@ -2272,7 +2272,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1528..1529, value: Int( 2, @@ -2288,11 +2288,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1552..1595, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1558..1559, id: Name("w"), ctx: Load, @@ -2301,22 +2301,22 @@ Module( cases: [ MatchCase { range: 1565..1595, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 1570..1580, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 1571..1572, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 1571..1572, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -2324,13 +2324,13 @@ Module( MatchAs( PatternMatchAs { range: 1574..1575, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 1574..1575, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -2338,7 +2338,7 @@ Module( MatchStar( PatternMatchStar { range: 1577..1579, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: None, }, ), @@ -2349,12 +2349,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1590..1595, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1590..1591, id: Name("z"), ctx: Store, @@ -2363,7 +2363,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1594..1595, value: Int( 0, @@ -2379,11 +2379,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1618..1664, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1624..1625, id: Name("x"), ctx: Load, @@ -2392,23 +2392,23 @@ Module( cases: [ MatchCase { range: 1631..1664, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 1636..1649, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1636..1649, left: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1636..1641, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1637..1641, value: Float( 0.25, @@ -2420,7 +2420,7 @@ Module( op: Sub, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1644..1649, value: Complex { real: 0.0, @@ -2436,12 +2436,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1659..1664, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1659..1660, id: Name("y"), ctx: Store, @@ -2450,7 +2450,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1663..1664, value: Int( 0, @@ -2466,16 +2466,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1687..1726, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1693..1697, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1694..1695, id: Name("x"), ctx: Load, @@ -2489,22 +2489,22 @@ Module( cases: [ MatchCase { range: 1703..1726, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 1708..1711, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 1709..1710, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 1709..1710, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -2516,12 +2516,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1721..1726, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1721..1722, id: Name("z"), ctx: Store, @@ -2530,7 +2530,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1725..1726, value: Int( 0, @@ -2546,11 +2546,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1749..1789, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1755..1756, id: Name("x"), ctx: Load, @@ -2559,26 +2559,26 @@ Module( cases: [ MatchCase { range: 1762..1789, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 1767..1774, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1767..1774, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1767..1772, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1767..1770, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1767..1768, id: Name("A"), ctx: Load, @@ -2587,7 +2587,7 @@ Module( attr: Identifier { id: Name("B"), range: 1769..1770, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -2595,7 +2595,7 @@ Module( attr: Identifier { id: Name("C"), range: 1771..1772, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -2603,7 +2603,7 @@ Module( attr: Identifier { id: Name("D"), range: 1773..1774, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -2614,12 +2614,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1784..1789, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1784..1785, id: Name("y"), ctx: Store, @@ -2628,7 +2628,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1788..1789, value: Int( 0, @@ -2644,11 +2644,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1812..1849, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1818..1819, id: Name("x"), ctx: Load, @@ -2657,11 +2657,11 @@ Module( cases: [ MatchCase { range: 1825..1849, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSingleton( PatternMatchSingleton { range: 1830..1834, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: None, }, ), @@ -2669,12 +2669,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1844..1849, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1844..1845, id: Name("y"), ctx: Store, @@ -2683,7 +2683,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1848..1849, value: Int( 0, @@ -2699,11 +2699,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1872..1906, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1878..1879, id: Name("x"), ctx: Load, @@ -2712,14 +2712,14 @@ Module( cases: [ MatchCase { range: 1885..1906, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 1890..1891, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1890..1891, value: Int( 0, @@ -2732,12 +2732,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1901..1906, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1901..1902, id: Name("y"), ctx: Store, @@ -2746,7 +2746,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1905..1906, value: Int( 0, @@ -2762,11 +2762,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1929..1967, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1935..1936, id: Name("x"), ctx: Load, @@ -2775,11 +2775,11 @@ Module( cases: [ MatchCase { range: 1942..1967, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSingleton( PatternMatchSingleton { range: 1947..1952, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: False, }, ), @@ -2787,12 +2787,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1962..1967, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1962..1963, id: Name("y"), ctx: Store, @@ -2801,7 +2801,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1966..1967, value: Int( 0, @@ -2817,11 +2817,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1990..2081, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1996..1997, id: Name("x"), ctx: Load, @@ -2830,11 +2830,11 @@ Module( cases: [ MatchCase { range: 2003..2025, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 2008..2010, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], }, ), @@ -2842,12 +2842,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2020..2025, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2020..2021, id: Name("y"), ctx: Store, @@ -2856,7 +2856,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2024..2025, value: Int( 0, @@ -2869,25 +2869,25 @@ Module( }, MatchCase { range: 2030..2054, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 2035..2039, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 2036..2038, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2036..2038, value: StringLiteralValue { inner: Single( StringLiteral { range: 2036..2038, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Double, @@ -2908,12 +2908,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2049..2054, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2049..2050, id: Name("y"), ctx: Store, @@ -2922,7 +2922,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2053..2054, value: Int( 1, @@ -2935,20 +2935,20 @@ Module( }, MatchCase { range: 2059..2081, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 2064..2066, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2064..2066, value: StringLiteralValue { inner: Single( StringLiteral { range: 2064..2066, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Double, @@ -2966,12 +2966,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2076..2081, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2076..2077, id: Name("y"), ctx: Store, @@ -2980,7 +2980,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2080..2081, value: Int( 2, @@ -2996,11 +2996,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2104..2138, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2110..2111, id: Name("x"), ctx: Load, @@ -3009,17 +3009,17 @@ Module( cases: [ MatchCase { range: 2117..2138, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 2122..2123, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("z"), range: 2122..2123, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -3028,12 +3028,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2133..2138, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2133..2134, id: Name("y"), ctx: Store, @@ -3042,7 +3042,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2137..2138, value: Int( 0, @@ -3058,11 +3058,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2161..2207, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2167..2168, id: Name("w"), ctx: Load, @@ -3071,22 +3071,22 @@ Module( cases: [ MatchCase { range: 2174..2207, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 2179..2192, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 2180..2181, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("x"), range: 2180..2181, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -3094,13 +3094,13 @@ Module( MatchAs( PatternMatchAs { range: 2183..2184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 2183..2184, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -3108,12 +3108,12 @@ Module( MatchStar( PatternMatchStar { range: 2186..2191, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Some( Identifier { id: Name("rest"), range: 2187..2191, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -3125,12 +3125,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2202..2207, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2202..2203, id: Name("z"), ctx: Store, @@ -3139,7 +3139,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2206..2207, value: Int( 0, @@ -3155,11 +3155,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2230..2307, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2236..2237, id: Name("x"), ctx: Load, @@ -3168,24 +3168,24 @@ Module( cases: [ MatchCase { range: 2243..2307, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 2248..2278, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 2249..2255, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchValue( PatternMatchValue { range: 2249..2250, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2249..2250, value: Int( 0, @@ -3199,7 +3199,7 @@ Module( Identifier { id: Name("z"), range: 2254..2255, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -3207,15 +3207,15 @@ Module( MatchAs( PatternMatchAs { range: 2260..2266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchValue( PatternMatchValue { range: 2260..2261, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2260..2261, value: Int( 1, @@ -3229,7 +3229,7 @@ Module( Identifier { id: Name("z"), range: 2265..2266, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -3237,15 +3237,15 @@ Module( MatchAs( PatternMatchAs { range: 2271..2277, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchValue( PatternMatchValue { range: 2271..2272, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2271..2272, value: Int( 2, @@ -3259,7 +3259,7 @@ Module( Identifier { id: Name("z"), range: 2276..2277, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -3270,11 +3270,11 @@ Module( guard: Some( Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2282..2292, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2282..2283, id: Name("z"), ctx: Load, @@ -3286,11 +3286,11 @@ Module( comparators: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2287..2292, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2287..2288, id: Name("x"), ctx: Load, @@ -3299,7 +3299,7 @@ Module( op: Mod, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2291..2292, value: Int( 2, @@ -3315,12 +3315,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2302..2307, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2302..2303, id: Name("y"), ctx: Store, @@ -3329,7 +3329,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2306..2307, value: Int( 0, @@ -3345,11 +3345,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2330..2499, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2336..2337, id: Name("x"), ctx: Load, @@ -3358,15 +3358,15 @@ Module( cases: [ MatchCase { range: 2343..2378, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 2348..2363, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2349..2350, value: Int( 0, @@ -3378,15 +3378,15 @@ Module( MatchSequence( PatternMatchSequence { range: 2352..2362, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 2353..2354, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2353..2354, value: Int( 1, @@ -3398,10 +3398,10 @@ Module( MatchValue( PatternMatchValue { range: 2356..2357, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2356..2357, value: Int( 2, @@ -3413,7 +3413,7 @@ Module( MatchMapping( PatternMatchMapping { range: 2359..2361, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: None, @@ -3430,12 +3430,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2373..2378, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2373..2374, id: Name("y"), ctx: Store, @@ -3444,7 +3444,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2377..2378, value: Int( 0, @@ -3457,20 +3457,20 @@ Module( }, MatchCase { range: 2383..2472, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 2388..2457, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchMapping( PatternMatchMapping { range: 2388..2411, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2389..2390, value: Int( 0, @@ -3482,20 +3482,20 @@ Module( MatchOr( PatternMatchOr { range: 2392..2410, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchSequence( PatternMatchSequence { range: 2392..2402, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 2393..2394, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2393..2394, value: Int( 1, @@ -3507,10 +3507,10 @@ Module( MatchValue( PatternMatchValue { range: 2396..2397, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2396..2397, value: Int( 2, @@ -3522,7 +3522,7 @@ Module( MatchMapping( PatternMatchMapping { range: 2399..2401, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: None, @@ -3534,7 +3534,7 @@ Module( MatchSingleton( PatternMatchSingleton { range: 2405..2410, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: False, }, ), @@ -3548,11 +3548,11 @@ Module( MatchMapping( PatternMatchMapping { range: 2414..2423, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2415..2416, value: Int( 1, @@ -3564,12 +3564,12 @@ Module( MatchSequence( PatternMatchSequence { range: 2418..2422, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchSequence( PatternMatchSequence { range: 2419..2421, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], }, ), @@ -3583,11 +3583,11 @@ Module( MatchMapping( PatternMatchMapping { range: 2426..2441, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2427..2428, value: Int( 0, @@ -3599,15 +3599,15 @@ Module( MatchSequence( PatternMatchSequence { range: 2430..2440, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 2431..2432, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2431..2432, value: Int( 1, @@ -3619,10 +3619,10 @@ Module( MatchValue( PatternMatchValue { range: 2434..2435, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2434..2435, value: Int( 2, @@ -3634,7 +3634,7 @@ Module( MatchMapping( PatternMatchMapping { range: 2437..2439, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: None, @@ -3650,23 +3650,23 @@ Module( MatchSequence( PatternMatchSequence { range: 2444..2446, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], }, ), MatchValue( PatternMatchValue { range: 2449..2452, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2449..2452, value: StringLiteralValue { inner: Single( StringLiteral { range: 2449..2452, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "X", flags: StringLiteralFlags { quote_style: Double, @@ -3683,7 +3683,7 @@ Module( MatchMapping( PatternMatchMapping { range: 2455..2457, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: None, @@ -3696,12 +3696,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2467..2472, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2467..2468, id: Name("y"), ctx: Store, @@ -3710,7 +3710,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2471..2472, value: Int( 1, @@ -3723,11 +3723,11 @@ Module( }, MatchCase { range: 2477..2499, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 2482..2484, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], }, ), @@ -3735,12 +3735,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2494..2499, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2494..2495, id: Name("y"), ctx: Store, @@ -3749,7 +3749,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2498..2499, value: Int( 2, @@ -3765,16 +3765,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2522..2568, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2528..2537, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2529..2530, value: Int( 0, @@ -3783,7 +3783,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2532..2533, value: Int( 1, @@ -3792,7 +3792,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2535..2536, value: Int( 2, @@ -3807,19 +3807,19 @@ Module( cases: [ MatchCase { range: 2543..2568, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 2548..2553, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 2548..2549, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2548..2549, value: Int( 0, @@ -3831,12 +3831,12 @@ Module( MatchStar( PatternMatchStar { range: 2551..2553, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Some( Identifier { id: Name("x"), range: 2552..2553, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -3848,12 +3848,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2563..2568, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2563..2564, id: Name("y"), ctx: Store, @@ -3862,7 +3862,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2567..2568, value: Int( 0, @@ -3878,16 +3878,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2591..2638, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2597..2606, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2598..2599, value: Int( 0, @@ -3896,7 +3896,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2601..2602, value: Int( 1, @@ -3905,7 +3905,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2604..2605, value: Int( 2, @@ -3920,21 +3920,21 @@ Module( cases: [ MatchCase { range: 2612..2638, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 2617..2623, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchStar( PatternMatchStar { range: 2617..2619, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Some( Identifier { id: Name("x"), range: 2618..2619, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -3942,10 +3942,10 @@ Module( MatchValue( PatternMatchValue { range: 2621..2622, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2621..2622, value: Int( 2, @@ -3961,12 +3961,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2633..2638, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2633..2634, id: Name("y"), ctx: Store, @@ -3975,7 +3975,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2637..2638, value: Int( 0, @@ -3991,16 +3991,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2661..2697, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2667..2669, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2667..2668, id: Name("x"), ctx: Load, @@ -4014,22 +4014,22 @@ Module( cases: [ MatchCase { range: 2675..2697, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 2680..2682, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 2680..2681, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 2680..2681, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -4041,12 +4041,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2692..2697, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2692..2693, id: Name("z"), ctx: Store, @@ -4055,7 +4055,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2696..2697, value: Int( 0, @@ -4071,16 +4071,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2720..2760, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2726..2730, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2726..2727, id: Name("w"), ctx: Load, @@ -4088,7 +4088,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2729..2730, id: Name("x"), ctx: Load, @@ -4102,22 +4102,22 @@ Module( cases: [ MatchCase { range: 2736..2760, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 2741..2745, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 2741..2742, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 2741..2742, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -4125,13 +4125,13 @@ Module( MatchAs( PatternMatchAs { range: 2744..2745, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("z"), range: 2744..2745, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -4143,12 +4143,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2755..2760, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2755..2756, id: Name("v"), ctx: Store, @@ -4157,7 +4157,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2759..2760, value: Int( 0, @@ -4173,20 +4173,20 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2783..2829, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2789..2796, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2789..2795, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2789..2790, id: Name("w"), ctx: Store, @@ -4194,7 +4194,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2794..2795, id: Name("x"), ctx: Load, @@ -4210,27 +4210,27 @@ Module( cases: [ MatchCase { range: 2802..2829, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 2807..2814, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 2807..2813, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchAs( PatternMatchAs { range: 2807..2808, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("y"), range: 2807..2808, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -4240,7 +4240,7 @@ Module( Identifier { id: Name("v"), range: 2812..2813, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -4252,12 +4252,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2824..2829, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2824..2825, id: Name("z"), ctx: Store, @@ -4266,7 +4266,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2828..2829, value: Int( 0, @@ -4282,11 +4282,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2831..2952, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2837..2838, id: Name("x"), ctx: Load, @@ -4295,29 +4295,29 @@ Module( cases: [ MatchCase { range: 2927..2952, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 2932..2938, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2932..2938, value: FStringValue { inner: Single( FString( FString { range: 2932..2938, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 2934..2937, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2935..2936, id: Name("y"), ctx: Load, @@ -4346,7 +4346,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2948..2952, }, ), @@ -4357,24 +4357,24 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2953..3025, subject: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2959..2970, items: [ DictItem { key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2960..2966, value: StringLiteralValue { inner: Single( StringLiteral { range: 2960..2966, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "test", flags: StringLiteralFlags { quote_style: Double, @@ -4389,7 +4389,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 2968..2969, value: Int( 1, @@ -4403,18 +4403,18 @@ Module( cases: [ MatchCase { range: 2976..3025, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 2981..3004, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [], patterns: [], rest: Some( Identifier { id: Name("rest"), range: 2993..2997, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -4423,15 +4423,15 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3014..3025, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3014..3025, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3014..3019, id: Name("print"), ctx: Load, @@ -4439,11 +4439,11 @@ Module( ), arguments: Arguments { range: 3019..3025, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3020..3024, id: Name("rest"), ctx: Load, @@ -4463,24 +4463,24 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3026..3129, subject: Dict( ExprDict { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3032..3049, items: [ DictItem { key: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3033..3040, value: StringLiteralValue { inner: Single( StringLiteral { range: 3033..3040, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "label", flags: StringLiteralFlags { quote_style: Double, @@ -4495,13 +4495,13 @@ Module( ), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3042..3048, value: StringLiteralValue { inner: Single( StringLiteral { range: 3042..3048, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "test", flags: StringLiteralFlags { quote_style: Double, @@ -4520,21 +4520,21 @@ Module( cases: [ MatchCase { range: 3055..3129, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 3060..3107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3070..3077, value: StringLiteralValue { inner: Single( StringLiteral { range: 3070..3077, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "label", flags: StringLiteralFlags { quote_style: Double, @@ -4551,20 +4551,20 @@ Module( MatchAs( PatternMatchAs { range: 3079..3100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchOr( PatternMatchOr { range: 3079..3091, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchClass( PatternMatchClass { range: 3079..3084, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3079..3082, id: Name("str"), ctx: Load, @@ -4572,7 +4572,7 @@ Module( ), arguments: PatternArguments { range: 3082..3084, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [], }, @@ -4581,7 +4581,7 @@ Module( MatchSingleton( PatternMatchSingleton { range: 3087..3091, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: None, }, ), @@ -4593,7 +4593,7 @@ Module( Identifier { id: Name("label"), range: 3095..3100, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -4606,15 +4606,15 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3117..3129, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3117..3129, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3117..3122, id: Name("print"), ctx: Load, @@ -4622,11 +4622,11 @@ Module( ), arguments: Arguments { range: 3122..3129, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3123..3128, id: Name("label"), ctx: Load, @@ -4646,11 +4646,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3130..3170, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3136..3137, id: Name("x"), ctx: Load, @@ -4659,19 +4659,19 @@ Module( cases: [ MatchCase { range: 3143..3170, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 3148..3155, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 3149..3150, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3149..3150, value: Int( 0, @@ -4683,10 +4683,10 @@ Module( MatchValue( PatternMatchValue { range: 3152..3153, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3152..3153, value: Int( 1, @@ -4702,12 +4702,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3165..3170, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3165..3166, id: Name("y"), ctx: Store, @@ -4716,7 +4716,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3169..3170, value: Int( 0, @@ -4732,11 +4732,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3171..3211, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3177..3178, id: Name("x"), ctx: Load, @@ -4745,19 +4745,19 @@ Module( cases: [ MatchCase { range: 3184..3211, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 3189..3196, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 3190..3191, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3190..3191, value: Int( 0, @@ -4769,10 +4769,10 @@ Module( MatchValue( PatternMatchValue { range: 3193..3194, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3193..3194, value: Int( 1, @@ -4788,12 +4788,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3206..3211, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3206..3207, id: Name("y"), ctx: Store, @@ -4802,7 +4802,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3210..3211, value: Int( 0, @@ -4818,11 +4818,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3212..3249, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3218..3219, id: Name("x"), ctx: Load, @@ -4831,19 +4831,19 @@ Module( cases: [ MatchCase { range: 3225..3249, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 3230..3234, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 3231..3232, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3231..3232, value: Int( 0, @@ -4859,12 +4859,12 @@ Module( body: [ Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3244..3249, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3244..3245, id: Name("y"), ctx: Store, @@ -4873,7 +4873,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3248..3249, value: Int( 0, @@ -4889,16 +4889,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3250..3284, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3256..3258, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3256..3257, id: Name("x"), ctx: Load, @@ -4912,17 +4912,17 @@ Module( cases: [ MatchCase { range: 3264..3284, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 3269..3270, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("z"), range: 3269..3270, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -4931,7 +4931,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3280..3284, }, ), @@ -4942,16 +4942,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3285..3321, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3291..3295, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3291..3292, id: Name("x"), ctx: Load, @@ -4959,7 +4959,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3294..3295, id: Name("y"), ctx: Load, @@ -4973,17 +4973,17 @@ Module( cases: [ MatchCase { range: 3301..3321, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 3306..3307, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("z"), range: 3306..3307, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -4992,7 +4992,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3317..3321, }, ), @@ -5003,16 +5003,16 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3322..3359, subject: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3328..3333, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3328..3329, id: Name("x"), ctx: Load, @@ -5020,7 +5020,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3331..3332, id: Name("y"), ctx: Load, @@ -5034,17 +5034,17 @@ Module( cases: [ MatchCase { range: 3339..3359, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 3344..3345, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("z"), range: 3344..3345, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -5053,7 +5053,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3355..3359, }, ), @@ -5064,11 +5064,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3385..3475, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3391..3392, id: Name("x"), ctx: Load, @@ -5077,11 +5077,11 @@ Module( cases: [ MatchCase { range: 3398..3420, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSingleton( PatternMatchSingleton { range: 3403..3407, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: None, }, ), @@ -5089,11 +5089,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3417..3420, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3417..3420, }, ), @@ -5103,11 +5103,11 @@ Module( }, MatchCase { range: 3425..3447, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSingleton( PatternMatchSingleton { range: 3430..3434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: True, }, ), @@ -5115,11 +5115,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3444..3447, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3444..3447, }, ), @@ -5129,11 +5129,11 @@ Module( }, MatchCase { range: 3452..3475, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSingleton( PatternMatchSingleton { range: 3457..3462, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: False, }, ), @@ -5141,11 +5141,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3472..3475, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3472..3475, }, ), @@ -5158,11 +5158,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3497..3821, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3503..3504, id: Name("x"), ctx: Load, @@ -5171,18 +5171,18 @@ Module( cases: [ MatchCase { range: 3510..3531, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3515..3518, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3515..3518, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3515..3516, id: Name("a"), ctx: Load, @@ -5191,7 +5191,7 @@ Module( attr: Identifier { id: Name("b"), range: 3517..3518, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -5202,11 +5202,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3528..3531, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3528..3531, }, ), @@ -5216,22 +5216,22 @@ Module( }, MatchCase { range: 3536..3559, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3541..3546, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3541..3546, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3541..3544, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3541..3542, id: Name("a"), ctx: Load, @@ -5240,7 +5240,7 @@ Module( attr: Identifier { id: Name("b"), range: 3543..3544, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -5248,7 +5248,7 @@ Module( attr: Identifier { id: Name("c"), range: 3545..3546, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -5259,11 +5259,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3556..3559, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3556..3559, }, ), @@ -5273,20 +5273,20 @@ Module( }, MatchCase { range: 3564..3584, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3569..3571, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3569..3571, value: StringLiteralValue { inner: Single( StringLiteral { range: 3569..3571, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, @@ -5304,11 +5304,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3581..3584, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3581..3584, }, ), @@ -5318,20 +5318,20 @@ Module( }, MatchCase { range: 3589..3610, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3594..3597, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BytesLiteral( ExprBytesLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3594..3597, value: BytesLiteralValue { inner: Single( BytesLiteral { range: 3594..3597, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: [], flags: BytesLiteralFlags { quote_style: Single, @@ -5349,11 +5349,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3607..3610, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3607..3610, }, ), @@ -5363,14 +5363,14 @@ Module( }, MatchCase { range: 3615..3634, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3620..3621, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3620..3621, value: Int( 1, @@ -5383,11 +5383,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3631..3634, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3631..3634, }, ), @@ -5397,14 +5397,14 @@ Module( }, MatchCase { range: 3639..3660, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3644..3647, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3644..3647, value: Float( 1.0, @@ -5417,11 +5417,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3657..3660, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3657..3660, }, ), @@ -5431,14 +5431,14 @@ Module( }, MatchCase { range: 3665..3687, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3670..3674, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3670..3674, value: Complex { real: 0.0, @@ -5452,11 +5452,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3684..3687, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3684..3687, }, ), @@ -5466,18 +5466,18 @@ Module( }, MatchCase { range: 3692..3716, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3697..3703, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3697..3703, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3697..3698, value: Int( 1, @@ -5487,7 +5487,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3701..3703, value: Complex { real: 0.0, @@ -5503,11 +5503,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3713..3716, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3713..3716, }, ), @@ -5517,19 +5517,19 @@ Module( }, MatchCase { range: 3721..3741, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3726..3728, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3726..3728, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3727..3728, value: Int( 1, @@ -5544,11 +5544,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3738..3741, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3738..3741, }, ), @@ -5558,19 +5558,19 @@ Module( }, MatchCase { range: 3746..3767, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3751..3754, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3751..3754, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3752..3754, value: Float( 1.0, @@ -5585,11 +5585,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3764..3767, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3764..3767, }, ), @@ -5599,19 +5599,19 @@ Module( }, MatchCase { range: 3772..3795, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3777..3782, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3777..3782, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3778..3782, value: Int( 1, @@ -5626,11 +5626,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3792..3795, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3792..3795, }, ), @@ -5640,14 +5640,14 @@ Module( }, MatchCase { range: 3800..3821, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 3806..3807, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3806..3807, value: Int( 1, @@ -5660,11 +5660,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3818..3821, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3818..3821, }, ), @@ -5677,11 +5677,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3840..3927, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3846..3847, id: Name("x"), ctx: Load, @@ -5690,19 +5690,19 @@ Module( cases: [ MatchCase { range: 3853..3876, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 3858..3863, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 3858..3859, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3858..3859, value: Int( 1, @@ -5714,10 +5714,10 @@ Module( MatchValue( PatternMatchValue { range: 3862..3863, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3862..3863, value: Int( 2, @@ -5733,11 +5733,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3873..3876, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3873..3876, }, ), @@ -5747,25 +5747,25 @@ Module( }, MatchCase { range: 3881..3927, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchOr( PatternMatchOr { range: 3886..3914, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 3886..3888, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3886..3888, value: StringLiteralValue { inner: Single( StringLiteral { range: 3886..3888, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, @@ -5782,10 +5782,10 @@ Module( MatchValue( PatternMatchValue { range: 3891..3894, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3891..3894, value: Float( 1.1, @@ -5797,15 +5797,15 @@ Module( MatchValue( PatternMatchValue { range: 3897..3899, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3897..3899, op: USub, operand: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3898..3899, value: Int( 1, @@ -5819,14 +5819,14 @@ Module( MatchValue( PatternMatchValue { range: 3902..3908, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3902..3908, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3902..3903, value: Int( 1, @@ -5836,7 +5836,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3906..3908, value: Complex { real: 0.0, @@ -5851,14 +5851,14 @@ Module( MatchValue( PatternMatchValue { range: 3911..3914, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3911..3914, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3911..3912, id: Name("a"), ctx: Load, @@ -5867,7 +5867,7 @@ Module( attr: Identifier { id: Name("b"), range: 3913..3914, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -5881,11 +5881,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3924..3927, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3924..3927, }, ), @@ -5898,11 +5898,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3946..3978, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3952..3953, id: Name("x"), ctx: Load, @@ -5911,17 +5911,17 @@ Module( cases: [ MatchCase { range: 3959..3978, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 3964..3965, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 3964..3965, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -5930,11 +5930,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3975..3978, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3975..3978, }, ), @@ -5947,11 +5947,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3979..4016, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 3985..3986, id: Name("x"), ctx: Load, @@ -5960,22 +5960,22 @@ Module( cases: [ MatchCase { range: 3992..4016, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 3997..4003, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchAs( PatternMatchAs { range: 3997..3998, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 3997..3998, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -5985,7 +5985,7 @@ Module( Identifier { id: Name("b"), range: 4002..4003, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -5994,11 +5994,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4013..4016, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4013..4016, }, ), @@ -6011,11 +6011,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4017..4157, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4023..4024, id: Name("x"), ctx: Load, @@ -6024,24 +6024,24 @@ Module( cases: [ MatchCase { range: 4030..4060, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 4035..4047, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchOr( PatternMatchOr { range: 4035..4040, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 4035..4036, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4035..4036, value: Int( 1, @@ -6053,10 +6053,10 @@ Module( MatchValue( PatternMatchValue { range: 4039..4040, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4039..4040, value: Int( 2, @@ -6073,7 +6073,7 @@ Module( Identifier { id: Name("two"), range: 4044..4047, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -6082,11 +6082,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4057..4060, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4057..4060, }, ), @@ -6096,23 +6096,23 @@ Module( }, MatchCase { range: 4065..4096, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 4070..4083, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchValue( PatternMatchValue { range: 4070..4076, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4070..4076, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4070..4071, value: Int( 1, @@ -6122,7 +6122,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4074..4076, value: Complex { real: 0.0, @@ -6139,7 +6139,7 @@ Module( Identifier { id: Name("sum"), range: 4080..4083, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -6148,11 +6148,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4093..4096, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4093..4096, }, ), @@ -6162,23 +6162,23 @@ Module( }, MatchCase { range: 4101..4128, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 4106..4115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchValue( PatternMatchValue { range: 4106..4109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4106..4109, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4106..4107, id: Name("a"), ctx: Load, @@ -6187,7 +6187,7 @@ Module( attr: Identifier { id: Name("b"), range: 4108..4109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -6199,7 +6199,7 @@ Module( Identifier { id: Name("ab"), range: 4113..4115, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -6208,11 +6208,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4125..4128, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4125..4128, }, ), @@ -6222,16 +6222,16 @@ Module( }, MatchCase { range: 4133..4157, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 4138..4144, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchAs( PatternMatchAs { range: 4138..4139, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -6241,7 +6241,7 @@ Module( Identifier { id: Name("x"), range: 4143..4144, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -6250,11 +6250,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4154..4157, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4154..4157, }, ), @@ -6267,11 +6267,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4158..4190, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4164..4165, id: Name("x"), ctx: Load, @@ -6280,11 +6280,11 @@ Module( cases: [ MatchCase { range: 4171..4190, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 4176..4177, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -6293,11 +6293,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4187..4190, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4187..4190, }, ), @@ -6310,11 +6310,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4215..4466, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4221..4222, id: Name("x"), ctx: Load, @@ -6323,19 +6323,19 @@ Module( cases: [ MatchCase { range: 4228..4253, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 4233..4240, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 4233..4234, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4233..4234, value: Int( 1, @@ -6347,10 +6347,10 @@ Module( MatchValue( PatternMatchValue { range: 4236..4237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4236..4237, value: Int( 2, @@ -6362,10 +6362,10 @@ Module( MatchValue( PatternMatchValue { range: 4239..4240, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4239..4240, value: Int( 3, @@ -6381,11 +6381,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4250..4253, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4250..4253, }, ), @@ -6395,19 +6395,19 @@ Module( }, MatchCase { range: 4258..4286, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 4263..4273, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 4264..4265, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4264..4265, value: Int( 1, @@ -6419,10 +6419,10 @@ Module( MatchValue( PatternMatchValue { range: 4267..4268, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4267..4268, value: Int( 2, @@ -6434,10 +6434,10 @@ Module( MatchValue( PatternMatchValue { range: 4270..4271, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4270..4271, value: Int( 3, @@ -6453,11 +6453,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4283..4286, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4283..4286, }, ), @@ -6467,23 +6467,23 @@ Module( }, MatchCase { range: 4291..4331, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 4296..4318, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 4297..4303, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4297..4303, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4297..4298, value: Int( 1, @@ -6493,7 +6493,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4301..4303, value: Complex { real: 0.0, @@ -6508,13 +6508,13 @@ Module( MatchAs( PatternMatchAs { range: 4305..4306, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 4305..4306, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -6522,21 +6522,21 @@ Module( MatchSingleton( PatternMatchSingleton { range: 4308..4312, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: None, }, ), MatchValue( PatternMatchValue { range: 4314..4317, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4314..4317, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4314..4315, id: Name("a"), ctx: Load, @@ -6545,7 +6545,7 @@ Module( attr: Identifier { id: Name("b"), range: 4316..4317, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -6559,11 +6559,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4328..4331, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4328..4331, }, ), @@ -6573,29 +6573,29 @@ Module( }, MatchCase { range: 4336..4370, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 4341..4357, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchSequence( PatternMatchSequence { range: 4341..4352, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchAs( PatternMatchAs { range: 4342..4348, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: Some( MatchValue( PatternMatchValue { range: 4342..4343, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4342..4343, value: Int( 1, @@ -6609,7 +6609,7 @@ Module( Identifier { id: Name("X"), range: 4347..4348, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -6617,13 +6617,13 @@ Module( MatchAs( PatternMatchAs { range: 4350..4351, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("b"), range: 4350..4351, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -6636,7 +6636,7 @@ Module( Identifier { id: Name("S"), range: 4356..4357, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -6645,11 +6645,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4367..4370, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4367..4370, }, ), @@ -6659,19 +6659,19 @@ Module( }, MatchCase { range: 4375..4407, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 4380..4394, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 4381..4382, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4381..4382, value: Int( 1, @@ -6683,10 +6683,10 @@ Module( MatchValue( PatternMatchValue { range: 4384..4385, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4384..4385, value: Int( 2, @@ -6698,14 +6698,14 @@ Module( MatchValue( PatternMatchValue { range: 4387..4393, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4387..4393, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4387..4388, value: Int( 3, @@ -6715,7 +6715,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4391..4393, value: Complex { real: 0.0, @@ -6734,11 +6734,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4404..4407, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4404..4407, }, ), @@ -6748,24 +6748,24 @@ Module( }, MatchCase { range: 4412..4440, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 4417..4427, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchSequence( PatternMatchSequence { range: 4418..4423, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 4419..4420, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4419..4420, value: Int( 1, @@ -6777,10 +6777,10 @@ Module( MatchValue( PatternMatchValue { range: 4421..4422, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4421..4422, value: Int( 2, @@ -6795,10 +6795,10 @@ Module( MatchValue( PatternMatchValue { range: 4425..4426, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4425..4426, value: Int( 3, @@ -6814,11 +6814,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4437..4440, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4437..4440, }, ), @@ -6828,19 +6828,19 @@ Module( }, MatchCase { range: 4445..4466, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 4450..4453, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 4451..4452, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4451..4452, value: Int( 1, @@ -6856,11 +6856,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4463..4466, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4463..4466, }, ), @@ -6873,11 +6873,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4487..4616, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4493..4494, id: Name("x"), ctx: Load, @@ -6886,21 +6886,21 @@ Module( cases: [ MatchCase { range: 4500..4521, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 4505..4508, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchStar( PatternMatchStar { range: 4505..4507, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Some( Identifier { id: Name("a"), range: 4506..4507, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -6912,11 +6912,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4518..4521, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4518..4521, }, ), @@ -6926,16 +6926,16 @@ Module( }, MatchCase { range: 4526..4547, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 4531..4534, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchStar( PatternMatchStar { range: 4531..4533, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: None, }, ), @@ -6946,11 +6946,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4544..4547, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4544..4547, }, ), @@ -6960,19 +6960,19 @@ Module( }, MatchCase { range: 4552..4583, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 4557..4570, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 4558..4559, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4558..4559, value: Int( 1, @@ -6984,10 +6984,10 @@ Module( MatchValue( PatternMatchValue { range: 4561..4562, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4561..4562, value: Int( 2, @@ -6999,12 +6999,12 @@ Module( MatchStar( PatternMatchStar { range: 4564..4569, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Some( Identifier { id: Name("rest"), range: 4565..4569, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -7016,11 +7016,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4580..4583, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4580..4583, }, ), @@ -7030,26 +7030,26 @@ Module( }, MatchCase { range: 4588..4616, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchSequence( PatternMatchSequence { range: 4593..4603, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchStar( PatternMatchStar { range: 4594..4596, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: None, }, ), MatchValue( PatternMatchValue { range: 4598..4599, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4598..4599, value: Int( 1, @@ -7061,10 +7061,10 @@ Module( MatchValue( PatternMatchValue { range: 4601..4602, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4601..4602, value: Int( 2, @@ -7080,11 +7080,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4613..4616, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4613..4616, }, ), @@ -7097,11 +7097,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4638..4910, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4644..4645, id: Name("x"), ctx: Load, @@ -7110,14 +7110,14 @@ Module( cases: [ MatchCase { range: 4651..4676, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 4656..4663, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4656..4661, id: Name("Point"), ctx: Load, @@ -7125,7 +7125,7 @@ Module( ), arguments: PatternArguments { range: 4661..4663, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [], }, @@ -7135,11 +7135,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4673..4676, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4673..4676, }, ), @@ -7149,22 +7149,22 @@ Module( }, MatchCase { range: 4681..4710, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 4686..4697, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4686..4695, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4686..4689, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4686..4687, id: Name("a"), ctx: Load, @@ -7173,7 +7173,7 @@ Module( attr: Identifier { id: Name("b"), range: 4688..4689, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -7181,14 +7181,14 @@ Module( attr: Identifier { id: Name("Point"), range: 4690..4695, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: PatternArguments { range: 4695..4697, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [], }, @@ -7198,11 +7198,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4707..4710, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4707..4710, }, ), @@ -7212,14 +7212,14 @@ Module( }, MatchCase { range: 4715..4745, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 4720..4732, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4720..4727, id: Name("Point2D"), ctx: Load, @@ -7227,24 +7227,24 @@ Module( ), arguments: PatternArguments { range: 4727..4732, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 4728..4731, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 4728..4729, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 4730..4731, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4730..4731, value: Int( 0, @@ -7262,11 +7262,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4742..4745, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4742..4745, }, ), @@ -7276,14 +7276,14 @@ Module( }, MatchCase { range: 4750..4786, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 4755..4773, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4755..4762, id: Name("Point2D"), ctx: Load, @@ -7291,24 +7291,24 @@ Module( ), arguments: PatternArguments { range: 4762..4773, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 4763..4766, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 4763..4764, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 4765..4766, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4765..4766, value: Int( 0, @@ -7320,19 +7320,19 @@ Module( }, PatternKeyword { range: 4768..4771, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("y"), range: 4768..4769, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 4770..4771, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4770..4771, value: Int( 0, @@ -7350,11 +7350,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4783..4786, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4783..4786, }, ), @@ -7364,14 +7364,14 @@ Module( }, MatchCase { range: 4791..4822, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 4796..4809, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4796..4803, id: Name("Point2D"), ctx: Load, @@ -7379,15 +7379,15 @@ Module( ), arguments: PatternArguments { range: 4803..4809, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 4804..4805, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4804..4805, value: Int( 0, @@ -7399,10 +7399,10 @@ Module( MatchValue( PatternMatchValue { range: 4807..4808, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4807..4808, value: Int( 1, @@ -7420,11 +7420,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4819..4822, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4819..4822, }, ), @@ -7434,14 +7434,14 @@ Module( }, MatchCase { range: 4827..4865, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 4832..4852, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4832..4839, id: Name("Point2D"), ctx: Load, @@ -7449,20 +7449,20 @@ Module( ), arguments: PatternArguments { range: 4839..4852, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchSequence( PatternMatchSequence { range: 4840..4846, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 4841..4842, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4841..4842, value: Int( 0, @@ -7474,10 +7474,10 @@ Module( MatchValue( PatternMatchValue { range: 4844..4845, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4844..4845, value: Int( 1, @@ -7493,19 +7493,19 @@ Module( keywords: [ PatternKeyword { range: 4848..4851, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("y"), range: 4848..4849, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 4850..4851, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4850..4851, value: Int( 1, @@ -7523,11 +7523,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4862..4865, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4862..4865, }, ), @@ -7537,14 +7537,14 @@ Module( }, MatchCase { range: 4870..4910, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchClass( PatternMatchClass { range: 4875..4897, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), cls: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4875..4882, id: Name("Point2D"), ctx: Load, @@ -7552,29 +7552,29 @@ Module( ), arguments: PatternArguments { range: 4882..4897, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [], keywords: [ PatternKeyword { range: 4883..4891, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("x"), range: 4883..4884, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchSequence( PatternMatchSequence { range: 4885..4891, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 4886..4887, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4886..4887, value: Int( 0, @@ -7586,10 +7586,10 @@ Module( MatchValue( PatternMatchValue { range: 4889..4890, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4889..4890, value: Int( 1, @@ -7604,19 +7604,19 @@ Module( }, PatternKeyword { range: 4893..4896, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), attr: Identifier { id: Name("y"), range: 4893..4894, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, pattern: MatchValue( PatternMatchValue { range: 4895..4896, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4895..4896, value: Int( 1, @@ -7634,11 +7634,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4907..4910, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4907..4910, }, ), @@ -7651,15 +7651,15 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4934..5028, subject: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4940..4946, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4940..4941, id: Name("x"), ctx: Store, @@ -7667,7 +7667,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4945..4946, id: Name("b"), ctx: Load, @@ -7678,15 +7678,15 @@ Module( cases: [ MatchCase { range: 4952..4976, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 4957..4963, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4958..4959, value: Int( 1, @@ -7698,7 +7698,7 @@ Module( MatchAs( PatternMatchAs { range: 4961..4962, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: None, }, @@ -7711,11 +7711,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4973..4976, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4973..4976, }, ), @@ -7725,21 +7725,21 @@ Module( }, MatchCase { range: 4981..5028, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchMapping( PatternMatchMapping { range: 4986..5015, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), keys: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4987..4989, value: StringLiteralValue { inner: Single( StringLiteral { range: 4987..4989, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "", flags: StringLiteralFlags { quote_style: Single, @@ -7753,7 +7753,7 @@ Module( ), NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 4994..4998, }, ), @@ -7762,13 +7762,13 @@ Module( MatchAs( PatternMatchAs { range: 4991..4992, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 4991..4992, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -7776,15 +7776,15 @@ Module( MatchSequence( PatternMatchSequence { range: 5000..5006, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), patterns: [ MatchValue( PatternMatchValue { range: 5001..5002, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5001..5002, value: Int( 1, @@ -7796,10 +7796,10 @@ Module( MatchValue( PatternMatchValue { range: 5004..5005, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5004..5005, value: Int( 2, @@ -7816,7 +7816,7 @@ Module( Identifier { id: Name("rest"), range: 5010..5014, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -7825,11 +7825,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5025..5028, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5025..5028, }, ), @@ -7842,11 +7842,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5046..5106, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5052..5053, id: Name("y"), ctx: Load, @@ -7855,17 +7855,17 @@ Module( cases: [ MatchCase { range: 5059..5080, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 5064..5065, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("a"), range: 5064..5065, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -7873,11 +7873,11 @@ Module( guard: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5069..5075, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5069..5070, id: Name("b"), ctx: Store, @@ -7885,7 +7885,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5074..5075, id: Name("c"), ctx: Load, @@ -7897,11 +7897,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5077..5080, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5077..5080, }, ), @@ -7911,17 +7911,17 @@ Module( }, MatchCase { range: 5085..5106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchAs( PatternMatchAs { range: 5090..5091, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: None, name: Some( Identifier { id: Name("e"), range: 5090..5091, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), }, @@ -7929,11 +7929,11 @@ Module( guard: Some( Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5096..5101, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5096..5097, value: Int( 1, @@ -7946,7 +7946,7 @@ Module( comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5100..5101, value: Int( 2, @@ -7960,11 +7960,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5103..5106, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5103..5106, }, ), @@ -7977,24 +7977,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5135..5150, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5135..5150, elts: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5135..5147, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5135..5143, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5135..5140, id: Name("match"), ctx: Load, @@ -8003,7 +8003,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5142..5143, id: Name("a"), ctx: Load, @@ -8014,7 +8014,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5146..5147, id: Name("b"), ctx: Load, @@ -8024,7 +8024,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5149..5150, id: Name("c"), ctx: Load, @@ -8039,20 +8039,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5176..5193, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5176..5193, elts: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5176..5190, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5176..5181, id: Name("match"), ctx: Load, @@ -8061,11 +8061,11 @@ Module( op: Mult, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5184..5189, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5184..5185, id: Name("a"), ctx: Load, @@ -8074,7 +8074,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5188..5189, id: Name("b"), ctx: Load, @@ -8086,7 +8086,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5192..5193, id: Name("c"), ctx: Load, @@ -8101,15 +8101,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5219..5236, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5219..5236, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5219..5224, id: Name("match"), ctx: Load, @@ -8117,19 +8117,19 @@ Module( ), arguments: Arguments { range: 5225..5236, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5226..5232, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5227..5232, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5227..5228, id: Name("a"), ctx: Load, @@ -8138,7 +8138,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5231..5232, id: Name("b"), ctx: Load, @@ -8151,7 +8151,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5234..5235, id: Name("c"), ctx: Load, @@ -8166,19 +8166,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5263..5279, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5263..5279, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5263..5275, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5263..5268, id: Name("match"), ctx: Load, @@ -8187,11 +8187,11 @@ Module( op: Sub, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5270..5275, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5270..5271, id: Name("a"), ctx: Load, @@ -8200,7 +8200,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5274..5275, id: Name("b"), ctx: Load, @@ -8213,7 +8213,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5278..5279, id: Name("c"), ctx: Load, @@ -8225,19 +8225,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5306..5324, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5306..5324, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5306..5320, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5306..5311, id: Name("match"), ctx: Load, @@ -8246,11 +8246,11 @@ Module( op: Sub, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5314..5319, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5314..5315, id: Name("a"), ctx: Load, @@ -8259,7 +8259,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5318..5319, id: Name("b"), ctx: Load, @@ -8272,7 +8272,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5323..5324, id: Name("c"), ctx: Load, @@ -8284,23 +8284,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5351..5369, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5351..5369, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5351..5365, left: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5351..5361, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5351..5356, id: Name("match"), ctx: Load, @@ -8308,16 +8308,16 @@ Module( ), arguments: Arguments { range: 5357..5361, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5358..5360, op: USub, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5359..5360, id: Name("a"), ctx: Load, @@ -8333,7 +8333,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5364..5365, id: Name("b"), ctx: Load, @@ -8344,7 +8344,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5368..5369, id: Name("c"), ctx: Load, @@ -8356,19 +8356,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5397..5407, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5397..5407, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5397..5405, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5397..5402, id: Name("match"), ctx: Load, @@ -8376,7 +8376,7 @@ Module( ), arguments: Arguments { range: 5403..5405, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -8385,7 +8385,7 @@ Module( attr: Identifier { id: Name("a"), range: 5406..5407, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -8394,19 +8394,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5424..5436, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5424..5436, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5424..5434, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5424..5429, id: Name("match"), ctx: Load, @@ -8414,11 +8414,11 @@ Module( ), arguments: Arguments { range: 5430..5434, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5431..5433, elts: [], ctx: Load, @@ -8433,7 +8433,7 @@ Module( attr: Identifier { id: Name("a"), range: 5435..5436, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -8442,19 +8442,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5455..5468, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5455..5468, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5455..5466, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5455..5460, id: Name("match"), ctx: Load, @@ -8462,11 +8462,11 @@ Module( ), arguments: Arguments { range: 5461..5466, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5462..5464, elts: [], ctx: Load, @@ -8481,7 +8481,7 @@ Module( attr: Identifier { id: Name("a"), range: 5467..5468, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -8490,19 +8490,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5487..5498, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5487..5498, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5487..5496, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5487..5492, id: Name("match"), ctx: Load, @@ -8510,7 +8510,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5494..5495, id: Name("a"), ctx: Load, @@ -8522,7 +8522,7 @@ Module( attr: Identifier { id: Name("b"), range: 5497..5498, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -8531,19 +8531,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5516..5528, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5516..5528, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5516..5526, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5516..5521, id: Name("match"), ctx: Load, @@ -8551,12 +8551,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5523..5525, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5523..5524, id: Name("a"), ctx: Load, @@ -8573,7 +8573,7 @@ Module( attr: Identifier { id: Name("b"), range: 5527..5528, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -8582,19 +8582,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5569..5583, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5569..5583, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5569..5581, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5569..5574, id: Name("match"), ctx: Load, @@ -8602,12 +8602,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5576..5580, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5577..5578, id: Name("a"), ctx: Load, @@ -8624,7 +8624,7 @@ Module( attr: Identifier { id: Name("b"), range: 5582..5583, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -8633,19 +8633,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5604..5621, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5604..5621, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5604..5611, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5604..5609, id: Name("match"), ctx: Load, @@ -8653,7 +8653,7 @@ Module( ), arguments: Arguments { range: 5609..5611, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -8661,12 +8661,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5612..5620, lower: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5612..5613, id: Name("a"), ctx: Load, @@ -8676,7 +8676,7 @@ Module( upper: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5619..5620, id: Name("b"), ctx: Load, @@ -8693,15 +8693,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5641..5660, test: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5644..5654, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5644..5649, id: Name("match"), ctx: Store, @@ -8709,7 +8709,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5653..5654, value: Int( 1, @@ -8721,7 +8721,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5656..5660, }, ), @@ -8731,11 +8731,11 @@ Module( ), Match( StmtMatch { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5661..5715, subject: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5667..5672, id: Name("match"), ctx: Load, @@ -8744,14 +8744,14 @@ Module( cases: [ MatchCase { range: 5678..5690, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 5683..5684, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5683..5684, value: Int( 1, @@ -8764,7 +8764,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5686..5690, }, ), @@ -8772,14 +8772,14 @@ Module( }, MatchCase { range: 5695..5715, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), pattern: MatchValue( PatternMatchValue { range: 5700..5701, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5700..5701, value: Int( 2, @@ -8792,7 +8792,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5711..5715, }, ), @@ -8803,12 +8803,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5716..5752, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5716..5721, id: Name("match"), ctx: Store, @@ -8817,26 +8817,24 @@ Module( ], value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5724..5752, parameters: Some( Parameters { range: 5731..5736, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 5731..5736, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 5731..5736, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("query"), range: 5731..5736, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -8850,11 +8848,11 @@ Module( ), body: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5738..5752, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5738..5743, id: Name("query"), ctx: Load, @@ -8866,7 +8864,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5747..5752, id: Name("event"), ctx: Load, @@ -8881,15 +8879,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5753..5769, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5753..5769, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5753..5758, id: Name("print"), ctx: Load, @@ -8897,15 +8895,15 @@ Module( ), arguments: Arguments { range: 5758..5769, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5759..5768, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5759..5764, id: Name("match"), ctx: Load, @@ -8913,11 +8911,11 @@ Module( ), arguments: Arguments { range: 5764..5768, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5765..5767, value: Int( 12, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap index 7329f1e3a9..698cce3151 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap @@ -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, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap index 7cb3690ead..cfedbc7332 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap @@ -7,24 +7,24 @@ input_file: crates/ruff_python_parser/resources/valid/statement/return.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..167, body: [ Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..6, value: None, }, ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 7..15, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..15, id: Name("x"), ctx: Load, @@ -35,21 +35,21 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..29, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..29, elts: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..25, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..25, id: Name("x"), ctx: Load, @@ -60,11 +60,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..29, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..29, id: Name("y"), ctx: Load, @@ -83,16 +83,16 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..45, value: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..44, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..39, id: Name("x"), ctx: Store, @@ -100,7 +100,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, value: Int( 1, @@ -114,12 +114,12 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..57, value: Some( NoneLiteral( ExprNoneLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..57, }, ), @@ -128,18 +128,18 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..72, value: Some( BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..72, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..66, id: Name("x"), ctx: Load, @@ -147,7 +147,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..72, id: Name("y"), ctx: Load, @@ -161,16 +161,16 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..85, value: Some( Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..85, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..81, value: Int( 1, @@ -183,7 +183,7 @@ Module( comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..85, value: Int( 2, @@ -198,17 +198,17 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..98, value: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..98, elts: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, value: Int( 1, @@ -217,7 +217,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..97, value: Int( 2, @@ -234,16 +234,16 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..112, value: Some( Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..112, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..110, id: Name("call"), ctx: Load, @@ -251,7 +251,7 @@ Module( ), arguments: Arguments { range: 110..112, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -262,20 +262,20 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..132, value: Some( Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..132, func: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..130, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..124, id: Name("attr"), ctx: Load, @@ -284,14 +284,14 @@ Module( attr: Identifier { id: Name("value"), range: 125..130, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, ), arguments: Arguments { range: 130..132, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -302,16 +302,16 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..147, value: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 140..147, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..147, id: Name("x"), ctx: Load, @@ -324,31 +324,29 @@ Module( ), Return( StmtReturn { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..166, value: Some( Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 155..166, parameters: Some( Parameters { range: 162..163, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 162..163, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 162..163, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 162..163, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -362,7 +360,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..166, id: Name("y"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap index 3865245dce..ee65e7f1fd 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap @@ -7,28 +7,28 @@ input_file: crates/ruff_python_parser/resources/valid/statement/simple.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..172, body: [ Continue( StmtContinue { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..69, }, ), Break( StmtBreak { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..75, }, ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..86, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 80..81, id: Name("x"), ctx: Load, @@ -37,11 +37,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..86, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..86, }, ), @@ -53,11 +53,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 87..100, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..94, value: true, }, @@ -65,7 +65,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..100, }, ), @@ -75,11 +75,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..102, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..102, value: Int( 1, @@ -90,11 +90,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, value: Int( 2, @@ -105,17 +105,17 @@ Module( ), Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 107..111, }, ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..113, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..113, value: Int( 1, @@ -126,11 +126,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..118, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..118, }, ), @@ -138,15 +138,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..133, value: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..133, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 125..126, id: Name("b"), ctx: Load, @@ -154,7 +154,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 120..121, id: Name("a"), ctx: Load, @@ -162,7 +162,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 132..133, id: Name("c"), ctx: Load, @@ -174,11 +174,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..157, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 138..139, id: Name("c"), ctx: Load, @@ -187,11 +187,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..142, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..142, id: Name("B"), ctx: Load, @@ -201,12 +201,12 @@ Module( ), Delete( StmtDelete { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 144..149, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..149, id: Name("A"), ctx: Del, @@ -219,16 +219,16 @@ Module( elif_else_clauses: [ ElifElseClause { range: 150..157, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..157, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 156..157, id: Name("C"), ctx: Load, @@ -243,11 +243,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 158..171, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 161..162, id: Name("x"), ctx: Load, @@ -256,16 +256,16 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..171, value: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..171, value: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 170..171, id: Name("x"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap index e6021299e9..962d435263 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/statement/try.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1223, body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..28, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..12, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..12, }, ), @@ -32,17 +32,17 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 13..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..28, }, ), @@ -59,16 +59,16 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 30..106, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 39..42, }, ), @@ -79,11 +79,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 43..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..60, id: Name("Exception1"), ctx: Load, @@ -94,17 +94,17 @@ Module( Identifier { id: Name("e"), range: 64..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..74, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 71..74, }, ), @@ -116,11 +116,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 75..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..92, id: Name("Exception2"), ctx: Load, @@ -131,17 +131,17 @@ Module( Identifier { id: Name("e"), range: 96..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..106, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 103..106, }, ), @@ -158,16 +158,16 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..184, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..120, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..120, }, ), @@ -178,11 +178,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 121..151, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..137, id: Name("Exception"), ctx: Load, @@ -193,17 +193,17 @@ Module( Identifier { id: Name("e"), range: 141..142, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..151, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..151, }, ), @@ -215,17 +215,17 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 152..167, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..167, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 164..167, }, ), @@ -239,11 +239,11 @@ Module( finalbody: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..184, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..184, }, ), @@ -255,16 +255,16 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 186..228, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 195..198, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 195..198, }, ), @@ -275,17 +275,17 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 199..214, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..214, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 211..214, }, ), @@ -298,11 +298,11 @@ Module( orelse: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..228, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 225..228, }, ), @@ -315,16 +315,16 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 230..289, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..242, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 239..242, }, ), @@ -335,17 +335,17 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 243..258, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: None, name: None, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..258, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..258, }, ), @@ -358,11 +358,11 @@ Module( orelse: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..272, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 269..272, }, ), @@ -372,11 +372,11 @@ Module( finalbody: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..289, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..289, }, ), @@ -388,16 +388,16 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 291..320, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..303, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 300..303, }, ), @@ -409,11 +409,11 @@ Module( finalbody: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..320, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..320, }, ), @@ -425,16 +425,16 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 322..365, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..334, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..334, }, ), @@ -445,11 +445,11 @@ Module( orelse: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 345..348, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 345..348, }, ), @@ -459,11 +459,11 @@ Module( finalbody: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 362..365, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 362..365, }, ), @@ -475,16 +475,16 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 367..441, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 376..379, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 376..379, }, ), @@ -495,11 +495,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 380..409, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 388..394, id: Name("GroupA"), ctx: Load, @@ -510,17 +510,17 @@ Module( Identifier { id: Name("eg"), range: 398..400, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 406..409, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 406..409, }, ), @@ -532,11 +532,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 410..441, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 418..432, id: Name("ExceptionGroup"), ctx: Load, @@ -547,11 +547,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 438..441, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 438..441, }, ), @@ -568,21 +568,21 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 443..577, body: [ Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 452..471, exc: Some( Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 458..471, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 458..468, id: Name("ValueError"), ctx: Load, @@ -590,11 +590,11 @@ Module( ), arguments: Arguments { range: 468..471, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 469..470, value: Int( 1, @@ -615,11 +615,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 472..525, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 479..488, id: Name("TypeError"), ctx: Load, @@ -630,21 +630,21 @@ Module( Identifier { id: Name("e"), range: 492..493, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 499..525, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 499..525, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 499..504, id: Name("print"), ctx: Load, @@ -652,37 +652,37 @@ Module( ), arguments: Arguments { range: 504..525, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 505..524, value: FStringValue { inner: Single( FString( FString { range: 505..524, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 507..514, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "caught ", }, ), Interpolation( InterpolatedElement { range: 514..523, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 515..522, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 515..519, id: Name("type"), ctx: Load, @@ -690,11 +690,11 @@ Module( ), arguments: Arguments { range: 519..522, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 520..521, id: Name("e"), ctx: Load, @@ -735,11 +735,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 526..577, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 533..540, id: Name("OSError"), ctx: Load, @@ -750,21 +750,21 @@ Module( Identifier { id: Name("e"), range: 544..545, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 551..577, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 551..577, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 551..556, id: Name("print"), ctx: Load, @@ -772,37 +772,37 @@ Module( ), arguments: Arguments { range: 556..577, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 557..576, value: FStringValue { inner: Single( FString( FString { range: 557..576, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 559..566, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "caught ", }, ), Interpolation( InterpolatedElement { range: 566..575, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 567..574, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 567..571, id: Name("type"), ctx: Load, @@ -810,11 +810,11 @@ Module( ), arguments: Arguments { range: 571..574, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 572..573, id: Name("e"), ctx: Load, @@ -860,21 +860,21 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 579..831, body: [ Raise( StmtRaise { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 588..669, exc: Some( Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 594..669, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 594..608, id: Name("ExceptionGroup"), ctx: Load, @@ -882,17 +882,17 @@ Module( ), arguments: Arguments { range: 608..669, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 609..613, value: StringLiteralValue { inner: Single( StringLiteral { range: 609..613, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "eg", flags: StringLiteralFlags { quote_style: Double, @@ -906,16 +906,16 @@ Module( ), List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 615..668, elts: [ Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 616..629, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 616..626, id: Name("ValueError"), ctx: Load, @@ -923,11 +923,11 @@ Module( ), arguments: Arguments { range: 626..629, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 627..628, value: Int( 1, @@ -941,11 +941,11 @@ Module( ), Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 631..643, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 631..640, id: Name("TypeError"), ctx: Load, @@ -953,11 +953,11 @@ Module( ), arguments: Arguments { range: 640..643, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 641..642, value: Int( 2, @@ -971,11 +971,11 @@ Module( ), Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 645..655, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 645..652, id: Name("OSError"), ctx: Load, @@ -983,11 +983,11 @@ Module( ), arguments: Arguments { range: 652..655, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 653..654, value: Int( 3, @@ -1001,11 +1001,11 @@ Module( ), Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 657..667, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 657..664, id: Name("OSError"), ctx: Load, @@ -1013,11 +1013,11 @@ Module( ), arguments: Arguments { range: 664..667, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 665..666, value: Int( 4, @@ -1047,11 +1047,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 670..751, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 678..687, id: Name("TypeError"), ctx: Load, @@ -1062,21 +1062,21 @@ Module( Identifier { id: Name("e"), range: 691..692, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 698..751, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 698..751, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 698..703, id: Name("print"), ctx: Load, @@ -1084,37 +1084,37 @@ Module( ), arguments: Arguments { range: 703..751, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 704..750, value: FStringValue { inner: Single( FString( FString { range: 704..750, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 706..713, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "caught ", }, ), Interpolation( InterpolatedElement { range: 713..722, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 714..721, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 714..718, id: Name("type"), ctx: Load, @@ -1122,11 +1122,11 @@ Module( ), arguments: Arguments { range: 718..721, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 719..720, id: Name("e"), ctx: Load, @@ -1145,21 +1145,21 @@ Module( Literal( InterpolatedStringLiteralElement { range: 722..735, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " with nested ", }, ), Interpolation( InterpolatedElement { range: 735..749, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 736..748, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 736..737, id: Name("e"), ctx: Load, @@ -1168,7 +1168,7 @@ Module( attr: Identifier { id: Name("exceptions"), range: 738..748, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -1203,11 +1203,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 752..831, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 760..767, id: Name("OSError"), ctx: Load, @@ -1218,21 +1218,21 @@ Module( Identifier { id: Name("e"), range: 771..772, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 778..831, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 778..831, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 778..783, id: Name("print"), ctx: Load, @@ -1240,37 +1240,37 @@ Module( ), arguments: Arguments { range: 783..831, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ FString( ExprFString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 784..830, value: FStringValue { inner: Single( FString( FString { range: 784..830, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 786..793, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "caught ", }, ), Interpolation( InterpolatedElement { range: 793..802, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 794..801, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 794..798, id: Name("type"), ctx: Load, @@ -1278,11 +1278,11 @@ Module( ), arguments: Arguments { range: 798..801, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 799..800, id: Name("e"), ctx: Load, @@ -1301,21 +1301,21 @@ Module( Literal( InterpolatedStringLiteralElement { range: 802..815, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: " with nested ", }, ), Interpolation( InterpolatedElement { range: 815..829, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 816..828, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 816..817, id: Name("e"), ctx: Load, @@ -1324,7 +1324,7 @@ Module( attr: Identifier { id: Name("exceptions"), range: 818..828, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -1364,12 +1364,12 @@ Module( ), Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 833..1075, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 842..846, }, ), @@ -1378,17 +1378,17 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 847..875, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 854..865, value: StringLiteralValue { inner: Single( StringLiteral { range: 854..865, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "exception", flags: StringLiteralFlags { quote_style: Double, @@ -1405,7 +1405,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 871..875, }, ), @@ -1415,11 +1415,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 876..894, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 883..884, value: Int( 1, @@ -1431,7 +1431,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 890..894, }, ), @@ -1441,11 +1441,11 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 895..916, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 902..906, value: true, }, @@ -1455,7 +1455,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 912..916, }, ), @@ -1465,15 +1465,15 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 917..939, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 924..929, left: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 924..925, value: Int( 1, @@ -1483,7 +1483,7 @@ Module( op: Add, right: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 928..929, value: Int( 1, @@ -1497,7 +1497,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 935..939, }, ), @@ -1507,15 +1507,15 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 940..962, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 947..952, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 947..948, id: Name("a"), ctx: Load, @@ -1524,7 +1524,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 951..952, id: Name("b"), ctx: Load, @@ -1537,7 +1537,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 958..962, }, ), @@ -1547,17 +1547,17 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 963..987, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 970..977, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 970..971, id: Name("x"), ctx: Load, @@ -1565,7 +1565,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 976..977, id: Name("y"), ctx: Load, @@ -1579,7 +1579,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 983..987, }, ), @@ -1589,15 +1589,15 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 988..1012, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 995..1002, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1001..1002, id: Name("x"), ctx: Load, @@ -1610,7 +1610,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1008..1012, }, ), @@ -1620,30 +1620,28 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 1013..1041, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1020..1031, parameters: Some( Parameters { range: 1027..1028, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 1027..1028, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1027..1028, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 1027..1028, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -1657,7 +1655,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1030..1031, id: Name("x"), ctx: Load, @@ -1670,7 +1668,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1037..1041, }, ), @@ -1680,22 +1678,22 @@ Module( ExceptHandler( ExceptHandlerExceptHandler { range: 1042..1075, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_: Some( If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1049..1065, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1054..1058, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1049..1050, id: Name("x"), ctx: Load, @@ -1703,7 +1701,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1064..1065, id: Name("y"), ctx: Load, @@ -1716,7 +1714,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1071..1075, }, ), @@ -1731,11 +1729,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1077..1222, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1080..1084, value: true, }, @@ -1743,12 +1741,12 @@ Module( body: [ Try( StmtTry { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1090..1133, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1103..1107, }, ), @@ -1758,7 +1756,7 @@ Module( finalbody: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1129..1133, }, ), @@ -1770,12 +1768,12 @@ Module( elif_else_clauses: [ ElifElseClause { range: 1208..1222, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1218..1222, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap index ca837dcde3..d12ea97256 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/type.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..1828, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..12, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,7 +25,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 9..12, id: Name("int"), ctx: Load, @@ -35,11 +35,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..31, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..19, id: Name("X"), ctx: Store, @@ -48,11 +48,11 @@ Module( type_params: None, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..31, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 22..25, id: Name("int"), ctx: Load, @@ -61,7 +61,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 28..31, id: Name("str"), ctx: Load, @@ -73,11 +73,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 32..60, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..38, id: Name("X"), ctx: Store, @@ -86,11 +86,11 @@ Module( type_params: None, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..60, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 41..44, id: Name("int"), ctx: Load, @@ -99,13 +99,13 @@ Module( op: BitOr, right: StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..60, value: StringLiteralValue { inner: Single( StringLiteral { range: 47..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "ForwardRefY", flags: StringLiteralFlags { quote_style: Double, @@ -123,11 +123,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..87, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..67, id: Name("X"), ctx: Store, @@ -136,16 +136,16 @@ Module( type_params: Some( TypeParams { range: 67..70, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 68..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 68..69, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -156,11 +156,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..87, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..74, id: Name("T"), ctx: Load, @@ -169,11 +169,11 @@ Module( op: BitOr, right: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..87, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..81, id: Name("list"), ctx: Load, @@ -181,11 +181,11 @@ Module( ), slice: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..86, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..83, id: Name("X"), ctx: Load, @@ -193,7 +193,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..85, id: Name("T"), ctx: Load, @@ -211,11 +211,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 101..116, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 106..107, id: Name("X"), ctx: Store, @@ -224,16 +224,16 @@ Module( type_params: Some( TypeParams { range: 107..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 108..109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 108..109, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -244,7 +244,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..116, id: Name("int"), ctx: Load, @@ -254,11 +254,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 117..145, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..123, id: Name("X"), ctx: Store, @@ -267,16 +267,16 @@ Module( type_params: Some( TypeParams { range: 123..126, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 124..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 124..125, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -287,15 +287,15 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..145, left: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..136, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..133, id: Name("list"), ctx: Load, @@ -303,7 +303,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 134..135, id: Name("T"), ctx: Load, @@ -315,11 +315,11 @@ Module( op: BitOr, right: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..145, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 139..142, id: Name("set"), ctx: Load, @@ -327,7 +327,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..144, id: Name("T"), ctx: Load, @@ -342,11 +342,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 146..178, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 151..152, id: Name("X"), ctx: Store, @@ -355,16 +355,16 @@ Module( type_params: Some( TypeParams { range: 152..165, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 153..154, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 153..154, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -373,11 +373,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 156..159, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 157..159, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -385,11 +385,11 @@ Module( ParamSpec( TypeParamParamSpec { range: 161..164, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 163..164, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -399,12 +399,12 @@ Module( ), value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..178, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 169..170, id: Name("T"), ctx: Load, @@ -412,7 +412,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..174, id: Name("Ts"), ctx: Load, @@ -420,7 +420,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 176..177, id: Name("P"), ctx: Load, @@ -435,11 +435,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..216, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 184..185, id: Name("X"), ctx: Store, @@ -448,21 +448,21 @@ Module( type_params: Some( TypeParams { range: 185..203, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 186..192, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 186..187, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 189..192, id: Name("int"), ctx: Load, @@ -475,11 +475,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 194..197, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 195..197, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -487,11 +487,11 @@ Module( ParamSpec( TypeParamParamSpec { range: 199..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 201..202, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -501,12 +501,12 @@ Module( ), value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 206..216, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 207..208, id: Name("T"), ctx: Load, @@ -514,7 +514,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 210..212, id: Name("Ts"), ctx: Load, @@ -522,7 +522,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..215, id: Name("P"), ctx: Load, @@ -537,11 +537,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..261, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..223, id: Name("X"), ctx: Store, @@ -550,26 +550,26 @@ Module( type_params: Some( TypeParams { range: 223..248, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 224..237, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 224..225, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..237, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..231, id: Name("int"), ctx: Load, @@ -577,7 +577,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..236, id: Name("str"), ctx: Load, @@ -595,11 +595,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 239..242, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 240..242, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -607,11 +607,11 @@ Module( ParamSpec( TypeParamParamSpec { range: 244..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 246..247, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -621,12 +621,12 @@ Module( ), value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 251..261, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 252..253, id: Name("T"), ctx: Load, @@ -634,7 +634,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 255..257, id: Name("Ts"), ctx: Load, @@ -642,7 +642,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..260, id: Name("P"), ctx: Load, @@ -657,11 +657,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 262..287, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 267..268, id: Name("X"), ctx: Store, @@ -670,22 +670,22 @@ Module( type_params: Some( TypeParams { range: 268..277, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 269..276, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 269..270, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 273..276, id: Name("int"), ctx: Load, @@ -699,11 +699,11 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 280..287, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 280..281, id: Name("T"), ctx: Load, @@ -712,7 +712,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 284..287, id: Name("str"), ctx: Load, @@ -724,11 +724,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 288..330, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 293..294, id: Name("X"), ctx: Store, @@ -737,25 +737,25 @@ Module( type_params: Some( TypeParams { range: 294..314, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 295..313, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 295..296, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 298..307, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 298..301, id: Name("int"), ctx: Load, @@ -764,7 +764,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 304..307, id: Name("str"), ctx: Load, @@ -776,7 +776,7 @@ Module( default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 310..313, id: Name("int"), ctx: Load, @@ -790,15 +790,15 @@ Module( ), value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..330, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..324, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 317..318, id: Name("T"), ctx: Load, @@ -807,7 +807,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 321..324, id: Name("int"), ctx: Load, @@ -818,7 +818,7 @@ Module( op: BitOr, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 327..330, id: Name("str"), ctx: Load, @@ -830,11 +830,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..384, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 336..337, id: Name("X"), ctx: Store, @@ -843,29 +843,29 @@ Module( type_params: Some( TypeParams { range: 337..361, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 338..360, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 339..341, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 344..360, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 345..360, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 345..350, id: Name("tuple"), ctx: Load, @@ -873,12 +873,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..359, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 351..354, id: Name("int"), ctx: Load, @@ -886,7 +886,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 356..359, id: Name("str"), ctx: Load, @@ -911,11 +911,11 @@ Module( ), value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..384, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 364..369, id: Name("tuple"), ctx: Load, @@ -923,12 +923,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 370..383, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 370..373, id: Name("int"), ctx: Load, @@ -936,11 +936,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 375..378, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 376..378, id: Name("Ts"), ctx: Load, @@ -951,7 +951,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 380..383, id: Name("str"), ctx: Load, @@ -969,11 +969,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 385..428, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 390..391, id: Name("X"), ctx: Store, @@ -982,26 +982,26 @@ Module( type_params: Some( TypeParams { range: 391..409, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 392..408, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 394..395, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( List( ExprList { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 398..408, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 399..402, id: Name("int"), ctx: Load, @@ -1009,7 +1009,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 404..407, id: Name("str"), ctx: Load, @@ -1027,11 +1027,11 @@ Module( ), value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 412..428, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 412..420, id: Name("Callable"), ctx: Load, @@ -1039,12 +1039,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..427, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 421..422, id: Name("P"), ctx: Load, @@ -1052,7 +1052,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 424..427, id: Name("str"), ctx: Load, @@ -1070,11 +1070,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 459..474, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 464..468, id: Name("type"), ctx: Store, @@ -1083,7 +1083,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 471..474, id: Name("int"), ctx: Load, @@ -1093,11 +1093,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 475..491, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 480..485, id: Name("match"), ctx: Store, @@ -1106,7 +1106,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 488..491, id: Name("int"), ctx: Load, @@ -1116,11 +1116,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 492..507, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 497..501, id: Name("case"), ctx: Store, @@ -1129,7 +1129,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 504..507, id: Name("int"), ctx: Load, @@ -1139,11 +1139,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 533..548, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 538..541, id: Name("foo"), ctx: Store, @@ -1152,7 +1152,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 544..548, id: Name("type"), ctx: Load, @@ -1162,11 +1162,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 549..565, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 554..557, id: Name("foo"), ctx: Store, @@ -1175,7 +1175,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 560..565, id: Name("match"), ctx: Load, @@ -1185,11 +1185,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 566..581, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 571..574, id: Name("foo"), ctx: Store, @@ -1198,7 +1198,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 577..581, id: Name("case"), ctx: Load, @@ -1208,11 +1208,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 605..620, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 613..614, id: Name("X"), ctx: Store, @@ -1221,7 +1221,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 617..620, id: Name("int"), ctx: Load, @@ -1231,11 +1231,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 621..636, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 626..627, id: Name("X"), ctx: Store, @@ -1244,7 +1244,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 633..636, id: Name("int"), ctx: Load, @@ -1254,11 +1254,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 637..652, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 642..643, id: Name("X"), ctx: Store, @@ -1267,7 +1267,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 649..652, id: Name("int"), ctx: Load, @@ -1277,11 +1277,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 653..673, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 658..659, id: Name("X"), ctx: Store, @@ -1290,7 +1290,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 668..671, id: Name("int"), ctx: Load, @@ -1300,11 +1300,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 674..693, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 685..686, id: Name("X"), ctx: Store, @@ -1313,16 +1313,16 @@ Module( type_params: Some( TypeParams { range: 686..689, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 687..688, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 687..688, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -1333,7 +1333,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 692..693, id: Name("T"), ctx: Load, @@ -1343,11 +1343,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 694..714, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 699..700, id: Name("X"), ctx: Store, @@ -1356,16 +1356,16 @@ Module( type_params: Some( TypeParams { range: 707..710, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 708..709, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 708..709, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -1376,7 +1376,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 713..714, id: Name("T"), ctx: Load, @@ -1386,11 +1386,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 715..734, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 720..721, id: Name("X"), ctx: Store, @@ -1399,16 +1399,16 @@ Module( type_params: Some( TypeParams { range: 721..724, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 722..723, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 722..723, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -1419,7 +1419,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 733..734, id: Name("T"), ctx: Load, @@ -1429,11 +1429,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 756..768, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 761..762, id: Name("X"), ctx: Store, @@ -1442,7 +1442,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 765..768, id: Name("int"), ctx: Load, @@ -1452,11 +1452,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 770..782, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 775..776, id: Name("X"), ctx: Store, @@ -1465,7 +1465,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 779..782, id: Name("str"), ctx: Load, @@ -1475,11 +1475,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 784..797, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 789..790, id: Name("X"), ctx: Store, @@ -1488,7 +1488,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 793..797, id: Name("type"), ctx: Load, @@ -1498,24 +1498,24 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 798..819, decorator_list: [], name: Identifier { id: Name("X"), range: 804..805, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: None, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 807..819, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 812..813, id: Name("X"), ctx: Store, @@ -1524,7 +1524,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 816..819, id: Name("int"), ctx: Load, @@ -1537,11 +1537,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 821..853, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 826..831, id: Name("Point"), ctx: Store, @@ -1550,11 +1550,11 @@ Module( type_params: None, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 834..853, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 834..839, id: Name("tuple"), ctx: Load, @@ -1562,12 +1562,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 840..852, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 840..845, id: Name("float"), ctx: Load, @@ -1575,7 +1575,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 847..852, id: Name("float"), ctx: Load, @@ -1593,11 +1593,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 854..881, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 859..864, id: Name("Point"), ctx: Store, @@ -1606,16 +1606,16 @@ Module( type_params: Some( TypeParams { range: 864..867, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 865..866, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 865..866, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -1626,11 +1626,11 @@ Module( ), value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 870..881, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 870..875, id: Name("tuple"), ctx: Load, @@ -1638,12 +1638,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 876..880, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 876..877, id: Name("T"), ctx: Load, @@ -1651,7 +1651,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 879..880, id: Name("T"), ctx: Load, @@ -1669,11 +1669,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 882..918, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 887..894, id: Name("IntFunc"), ctx: Store, @@ -1682,16 +1682,16 @@ Module( type_params: Some( TypeParams { range: 894..899, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 895..898, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 897..898, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -1701,11 +1701,11 @@ Module( ), value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 902..918, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 902..910, id: Name("Callable"), ctx: Load, @@ -1713,12 +1713,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 911..917, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 911..912, id: Name("P"), ctx: Load, @@ -1726,7 +1726,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 914..917, id: Name("int"), ctx: Load, @@ -1744,11 +1744,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 932..972, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 937..949, id: Name("LabeledTuple"), ctx: Store, @@ -1757,16 +1757,16 @@ Module( type_params: Some( TypeParams { range: 949..954, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 950..953, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 951..953, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -1776,11 +1776,11 @@ Module( ), value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 957..972, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 957..962, id: Name("tuple"), ctx: Load, @@ -1788,12 +1788,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 963..971, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 963..966, id: Name("str"), ctx: Load, @@ -1801,11 +1801,11 @@ Module( ), Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 968..971, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 969..971, id: Name("Ts"), ctx: Load, @@ -1826,11 +1826,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 989..1037, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 994..1010, id: Name("HashableSequence"), ctx: Store, @@ -1839,21 +1839,21 @@ Module( type_params: Some( TypeParams { range: 1010..1023, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 1011..1022, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 1011..1012, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1014..1022, id: Name("Hashable"), ctx: Load, @@ -1868,11 +1868,11 @@ Module( ), value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1026..1037, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1026..1034, id: Name("Sequence"), ctx: Load, @@ -1880,7 +1880,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1035..1036, id: Name("T"), ctx: Load, @@ -1893,11 +1893,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1060..1110, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1065..1081, id: Name("IntOrStrSequence"), ctx: Store, @@ -1906,26 +1906,26 @@ Module( type_params: Some( TypeParams { range: 1081..1096, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 1082..1095, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 1082..1083, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1085..1095, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1086..1089, id: Name("int"), ctx: Load, @@ -1933,7 +1933,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1091..1094, id: Name("str"), ctx: Load, @@ -1953,11 +1953,11 @@ Module( ), value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1099..1110, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1099..1107, id: Name("Sequence"), ctx: Load, @@ -1965,7 +1965,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1108..1109, id: Name("T"), ctx: Load, @@ -1978,24 +1978,24 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1164..1178, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1164..1178, elts: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1164..1175, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1164..1171, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1164..1168, id: Name("type"), ctx: Load, @@ -2004,7 +2004,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1170..1171, id: Name("a"), ctx: Load, @@ -2015,7 +2015,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1174..1175, id: Name("b"), ctx: Load, @@ -2025,7 +2025,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1177..1178, id: Name("c"), ctx: Load, @@ -2040,20 +2040,20 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1203..1219, value: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1203..1219, elts: [ BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1203..1216, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1203..1207, id: Name("type"), ctx: Load, @@ -2062,11 +2062,11 @@ Module( op: Mult, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1210..1215, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1210..1211, id: Name("a"), ctx: Load, @@ -2075,7 +2075,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1214..1215, id: Name("b"), ctx: Load, @@ -2087,7 +2087,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1218..1219, id: Name("c"), ctx: Load, @@ -2102,15 +2102,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1244..1260, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1244..1260, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1244..1248, id: Name("type"), ctx: Load, @@ -2118,19 +2118,19 @@ Module( ), arguments: Arguments { range: 1249..1260, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1250..1256, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1251..1256, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1251..1252, id: Name("a"), ctx: Load, @@ -2139,7 +2139,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1255..1256, id: Name("b"), ctx: Load, @@ -2152,7 +2152,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1258..1259, id: Name("c"), ctx: Load, @@ -2167,19 +2167,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1286..1301, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1286..1301, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1286..1297, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1286..1290, id: Name("type"), ctx: Load, @@ -2188,11 +2188,11 @@ Module( op: Sub, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1292..1297, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1292..1293, id: Name("a"), ctx: Load, @@ -2201,7 +2201,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1296..1297, id: Name("b"), ctx: Load, @@ -2214,7 +2214,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1300..1301, id: Name("c"), ctx: Load, @@ -2226,19 +2226,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1327..1344, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1327..1344, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1327..1340, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1327..1331, id: Name("type"), ctx: Load, @@ -2247,11 +2247,11 @@ Module( op: Sub, right: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1334..1339, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1334..1335, id: Name("a"), ctx: Load, @@ -2260,7 +2260,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1338..1339, id: Name("b"), ctx: Load, @@ -2273,7 +2273,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1343..1344, id: Name("c"), ctx: Load, @@ -2285,23 +2285,23 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1370..1387, value: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1370..1387, left: BinOp( ExprBinOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1370..1383, left: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1370..1379, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1370..1374, id: Name("type"), ctx: Load, @@ -2309,16 +2309,16 @@ Module( ), arguments: Arguments { range: 1375..1379, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ UnaryOp( ExprUnaryOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1376..1378, op: USub, operand: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1377..1378, id: Name("a"), ctx: Load, @@ -2334,7 +2334,7 @@ Module( op: Mult, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1382..1383, id: Name("b"), ctx: Load, @@ -2345,7 +2345,7 @@ Module( op: Add, right: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1386..1387, id: Name("c"), ctx: Load, @@ -2357,19 +2357,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1414..1423, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1414..1423, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1414..1421, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1414..1418, id: Name("type"), ctx: Load, @@ -2377,7 +2377,7 @@ Module( ), arguments: Arguments { range: 1419..1421, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -2386,7 +2386,7 @@ Module( attr: Identifier { id: Name("a"), range: 1422..1423, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -2395,19 +2395,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1439..1450, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1439..1450, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1439..1448, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1439..1443, id: Name("type"), ctx: Load, @@ -2415,11 +2415,11 @@ Module( ), arguments: Arguments { range: 1444..1448, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1445..1447, elts: [], ctx: Load, @@ -2434,7 +2434,7 @@ Module( attr: Identifier { id: Name("a"), range: 1449..1450, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -2443,19 +2443,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1468..1480, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1468..1480, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1468..1478, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1468..1472, id: Name("type"), ctx: Load, @@ -2463,11 +2463,11 @@ Module( ), arguments: Arguments { range: 1473..1478, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1474..1476, elts: [], ctx: Load, @@ -2482,7 +2482,7 @@ Module( attr: Identifier { id: Name("a"), range: 1479..1480, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -2491,19 +2491,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1498..1508, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1498..1508, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1498..1506, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1498..1502, id: Name("type"), ctx: Load, @@ -2511,7 +2511,7 @@ Module( ), slice: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1504..1505, id: Name("a"), ctx: Load, @@ -2523,7 +2523,7 @@ Module( attr: Identifier { id: Name("b"), range: 1507..1508, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -2532,19 +2532,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1525..1536, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1525..1536, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1525..1534, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1525..1529, id: Name("type"), ctx: Load, @@ -2552,12 +2552,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1531..1533, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1531..1532, id: Name("a"), ctx: Load, @@ -2574,7 +2574,7 @@ Module( attr: Identifier { id: Name("b"), range: 1535..1536, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -2583,19 +2583,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1575..1588, value: Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1575..1588, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1575..1586, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1575..1579, id: Name("type"), ctx: Load, @@ -2603,12 +2603,12 @@ Module( ), slice: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1581..1585, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1582..1583, id: Name("a"), ctx: Load, @@ -2625,7 +2625,7 @@ Module( attr: Identifier { id: Name("b"), range: 1587..1588, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Load, }, @@ -2634,19 +2634,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1608..1624, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1608..1624, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1608..1614, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1608..1612, id: Name("type"), ctx: Load, @@ -2654,7 +2654,7 @@ Module( ), arguments: Arguments { range: 1612..1614, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -2662,12 +2662,12 @@ Module( ), slice: Slice( ExprSlice { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1615..1623, lower: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1615..1616, id: Name("a"), ctx: Load, @@ -2677,7 +2677,7 @@ Module( upper: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1622..1623, id: Name("b"), ctx: Load, @@ -2694,15 +2694,15 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1643..1661, test: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1646..1655, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1646..1650, id: Name("type"), ctx: Store, @@ -2710,7 +2710,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1654..1655, value: Int( 1, @@ -2722,7 +2722,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1657..1661, }, ), @@ -2732,12 +2732,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1662..1697, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1662..1666, id: Name("type"), ctx: Store, @@ -2746,26 +2746,24 @@ Module( ], value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1669..1697, parameters: Some( Parameters { range: 1676..1681, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 1676..1681, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1676..1681, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("query"), range: 1676..1681, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -2779,11 +2777,11 @@ Module( ), body: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1683..1697, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1683..1688, id: Name("query"), ctx: Load, @@ -2795,7 +2793,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1692..1697, id: Name("event"), ctx: Load, @@ -2810,15 +2808,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1698..1713, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1698..1713, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1698..1703, id: Name("print"), ctx: Load, @@ -2826,15 +2824,15 @@ Module( ), arguments: Arguments { range: 1703..1713, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1704..1712, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1704..1708, id: Name("type"), ctx: Load, @@ -2842,11 +2840,11 @@ Module( ), arguments: Arguments { range: 1708..1712, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1709..1711, value: Int( 12, @@ -2867,15 +2865,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1714..1724, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1714..1724, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1714..1718, id: Name("type"), ctx: Load, @@ -2883,11 +2881,11 @@ Module( ), arguments: Arguments { range: 1718..1724, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1719..1723, id: Name("type"), ctx: Load, @@ -2902,12 +2900,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1725..1743, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1725..1726, id: Name("a"), ctx: Store, @@ -2916,11 +2914,11 @@ Module( ], value: Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1732..1741, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1732..1736, id: Name("type"), ctx: Load, @@ -2932,7 +2930,7 @@ Module( comparators: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1740..1741, id: Name("C"), ctx: Load, @@ -2945,12 +2943,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1744..1760, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1744..1745, id: Name("a"), ctx: Store, @@ -2959,11 +2957,11 @@ Module( ], value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1751..1758, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1751..1755, id: Name("type"), ctx: Load, @@ -2971,11 +2969,11 @@ Module( ), arguments: Arguments { range: 1755..1758, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1756..1757, id: Name("b"), ctx: Load, @@ -2990,15 +2988,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1761..1778, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1761..1778, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1761..1765, id: Name("type"), ctx: Load, @@ -3006,22 +3004,22 @@ Module( ), arguments: Arguments { range: 1766..1778, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [ Keyword { range: 1769..1776, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), arg: Some( Identifier { id: Name("X"), range: 1769..1770, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1773..1776, id: Name("int"), ctx: Load, @@ -3036,12 +3034,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1779..1787, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1779..1783, id: Name("type"), ctx: Store, @@ -3050,7 +3048,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1786..1787, value: Int( 1, @@ -3061,12 +3059,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1788..1800, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1788..1792, id: Name("type"), ctx: Store, @@ -3074,7 +3072,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1795..1796, id: Name("x"), ctx: Store, @@ -3083,7 +3081,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1799..1800, value: Int( 1, @@ -3094,12 +3092,12 @@ Module( ), Assign( StmtAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1801..1813, targets: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1801..1802, id: Name("x"), ctx: Store, @@ -3107,7 +3105,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1805..1809, id: Name("type"), ctx: Store, @@ -3116,7 +3114,7 @@ Module( ], value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1812..1813, value: Int( 1, @@ -3127,30 +3125,28 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1814..1828, value: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1814..1828, parameters: Some( Parameters { range: 1821..1822, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 1821..1822, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 1821..1822, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 1821..1822, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -3164,7 +3160,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 1824..1828, id: Name("type"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap index 5c2e2603e1..ca6b03c547 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/valid/statement/while.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..314, body: [ While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..16, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 6..7, id: Name("x"), ctx: Load, @@ -25,11 +25,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..16, }, ), @@ -41,21 +41,21 @@ Module( ), While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..61, test: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..37, op: And, values: [ Compare( ExprCompare { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..30, left: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 25..26, id: Name("x"), ctx: Load, @@ -67,7 +67,7 @@ Module( comparators: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 29..30, value: Int( 1, @@ -79,7 +79,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 36..37, id: Name("y"), ctx: Load, @@ -91,7 +91,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..47, }, ), @@ -99,11 +99,11 @@ Module( orelse: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..61, }, ), @@ -114,17 +114,17 @@ Module( ), While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..152, test: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..76, op: And, values: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..70, id: Name("x"), ctx: Load, @@ -132,7 +132,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..76, id: Name("y"), ctx: Load, @@ -144,11 +144,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..85, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 82..85, }, ), @@ -156,15 +156,15 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..111, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..111, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..95, id: Name("print"), ctx: Load, @@ -172,17 +172,17 @@ Module( ), arguments: Arguments { range: 95..111, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 96..110, value: StringLiteralValue { inner: Single( StringLiteral { range: 96..110, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Hello World!", flags: StringLiteralFlags { quote_style: Single, @@ -205,15 +205,15 @@ Module( orelse: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..144, value: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..144, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..128, id: Name("print"), ctx: Load, @@ -221,17 +221,17 @@ Module( ), arguments: Arguments { range: 128..144, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ StringLiteral( ExprStringLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..143, value: StringLiteralValue { inner: Single( StringLiteral { range: 129..143, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "Olá, Mundo!", flags: StringLiteralFlags { quote_style: Single, @@ -252,11 +252,11 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..152, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 149..152, }, ), @@ -267,15 +267,15 @@ Module( ), While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 154..171, test: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..166, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 160..161, id: Name("a"), ctx: Store, @@ -283,7 +283,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..166, id: Name("b"), ctx: Load, @@ -294,11 +294,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..171, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..171, }, ), @@ -310,21 +310,21 @@ Module( ), While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..197, test: BoolOp( ExprBoolOp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 178..192, op: And, values: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..185, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 179..180, id: Name("a"), ctx: Store, @@ -332,7 +332,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 184..185, id: Name("b"), ctx: Load, @@ -342,7 +342,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..192, id: Name("c"), ctx: Load, @@ -354,11 +354,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..197, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 194..197, }, ), @@ -370,30 +370,28 @@ Module( ), While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 198..220, test: Lambda( ExprLambda { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 204..215, parameters: Some( Parameters { range: 211..212, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 211..212, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 211..212, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 211..212, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: None, }, @@ -407,7 +405,7 @@ Module( ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 214..215, id: Name("x"), ctx: Load, @@ -418,11 +416,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..220, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..220, }, ), @@ -434,15 +432,15 @@ Module( ), While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 221..239, test: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 227..234, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 233..234, id: Name("x"), ctx: Load, @@ -453,11 +451,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..239, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..239, }, ), @@ -469,11 +467,11 @@ Module( ), If( StmtIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..313, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 244..248, value: true, }, @@ -481,11 +479,11 @@ Module( body: [ While( StmtWhile { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..298, test: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 260..261, id: Name("x"), ctx: Load, @@ -494,7 +492,7 @@ Module( body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..275, }, ), @@ -502,7 +500,7 @@ Module( orelse: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 294..298, }, ), @@ -513,12 +511,12 @@ Module( elif_else_clauses: [ ElifElseClause { range: 299..313, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), test: None, body: [ Pass( StmtPass { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 309..313, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap index 993b8cc48a..7919e803c8 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap @@ -7,21 +7,21 @@ input_file: crates/ruff_python_parser/resources/valid/statement/with.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..361, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 137..151, is_async: false, items: [ WithItem { range: 142..146, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 142..146, id: Name("item"), ctx: Load, @@ -33,11 +33,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..151, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 148..151, }, ), @@ -48,16 +48,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 152..171, is_async: false, items: [ WithItem { range: 157..166, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 157..161, id: Name("item"), ctx: Load, @@ -66,7 +66,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 165..166, id: Name("f"), ctx: Store, @@ -78,11 +78,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..171, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 168..171, }, ), @@ -93,16 +93,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 172..194, is_async: false, items: [ WithItem { range: 177..182, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 177..182, id: Name("item1"), ctx: Load, @@ -112,10 +112,10 @@ Module( }, WithItem { range: 184..189, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 184..189, id: Name("item2"), ctx: Load, @@ -127,11 +127,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..194, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 191..194, }, ), @@ -142,16 +142,16 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 195..229, is_async: false, items: [ WithItem { range: 200..211, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 200..205, id: Name("item1"), ctx: Load, @@ -160,7 +160,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 209..211, id: Name("f1"), ctx: Store, @@ -170,10 +170,10 @@ Module( }, WithItem { range: 213..224, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 213..218, id: Name("item2"), ctx: Load, @@ -182,7 +182,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 222..224, id: Name("f2"), ctx: Store, @@ -194,11 +194,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..229, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 226..229, }, ), @@ -209,27 +209,27 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 231..257, is_async: false, items: [ WithItem { range: 236..252, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..252, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 241..245, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..237, id: Name("x"), ctx: Load, @@ -237,7 +237,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 251..252, id: Name("y"), ctx: Load, @@ -251,11 +251,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..257, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 254..257, }, ), @@ -266,27 +266,27 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 258..289, is_async: false, items: [ WithItem { range: 263..284, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: If( ExprIf { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 263..279, test: BooleanLiteral( ExprBooleanLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 268..272, value: true, }, ), body: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 263..264, id: Name("x"), ctx: Load, @@ -294,7 +294,7 @@ Module( ), orelse: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 278..279, id: Name("y"), ctx: Load, @@ -305,7 +305,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 283..284, id: Name("f"), ctx: Store, @@ -317,11 +317,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..289, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 286..289, }, ), @@ -332,20 +332,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 313..334, is_async: false, items: [ WithItem { range: 318..329, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 318..324, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 318..322, id: Name("open"), ctx: Load, @@ -353,7 +353,7 @@ Module( ), arguments: Arguments { range: 322..324, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -362,7 +362,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 328..329, id: Name("f"), ctx: Store, @@ -374,11 +374,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..334, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 331..334, }, ), @@ -389,20 +389,20 @@ Module( ), With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 335..361, is_async: false, items: [ WithItem { range: 340..356, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..346, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 340..344, id: Name("open"), ctx: Load, @@ -410,7 +410,7 @@ Module( ), arguments: Arguments { range: 344..346, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -419,11 +419,11 @@ Module( optional_vars: Some( Attribute( ExprAttribute { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 350..356, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 350..351, id: Name("f"), ctx: Load, @@ -432,7 +432,7 @@ Module( attr: Identifier { id: Name("attr"), range: 352..356, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, ctx: Store, }, @@ -443,11 +443,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 358..361, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 358..361, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap index ba9ecb9c20..dda530ea46 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap @@ -7,30 +7,30 @@ input_file: crates/ruff_python_parser/resources/inline/ok/template_strings_py314 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..89, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..52, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..52, value: TStringValue { inner: Single( TString { range: 44..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 46..51, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..50, id: Name("hey"), ctx: Load, @@ -56,25 +56,25 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..63, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..63, value: TStringValue { inner: Single( TString { range: 53..63, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Interpolation( InterpolatedElement { range: 55..62, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), expression: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..61, id: Name("there"), ctx: Load, @@ -100,22 +100,22 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..88, value: TString( ExprTString { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 64..88, value: TStringValue { inner: Single( TString { range: 64..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), elements: [ Literal( InterpolatedStringLiteralElement { range: 68..85, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), value: "what's\nhappening?", }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap index 46550ad231..230855ad42 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap @@ -7,26 +7,26 @@ input_file: crates/ruff_python_parser/resources/inline/ok/tuple_context_manager_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..85, body: [ With( StmtWith { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..84, is_async: false, items: [ WithItem { range: 48..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), context_expr: Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..72, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..55, id: Name("foo"), ctx: Load, @@ -34,7 +34,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..62, id: Name("bar"), ctx: Load, @@ -42,7 +42,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..69, id: Name("baz"), ctx: Load, @@ -56,7 +56,7 @@ Module( optional_vars: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..79, id: Name("tup"), ctx: Store, @@ -68,11 +68,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap index 8387c4e874..f673f2901a 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/type_param_default_py3 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..112, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..65, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, id: Name("X"), ctx: Store, @@ -25,22 +25,22 @@ Module( type_params: Some( TypeParams { range: 50..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 51..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 51..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..58, id: Name("int"), ctx: Load, @@ -54,7 +54,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 62..65, id: Name("int"), ctx: Load, @@ -64,34 +64,34 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 66..87, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 70..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 71..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 72..79, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 72..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..79, id: Name("int"), ctx: Load, @@ -105,9 +105,7 @@ Module( ), parameters: Parameters { range: 80..82, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -118,11 +116,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..87, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..87, }, ), @@ -133,33 +131,33 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..111, decorator_list: [], name: Identifier { id: Name("C"), range: 94..95, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: Some( TypeParams { range: 95..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 96..103, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 96..97, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 100..103, id: Name("int"), ctx: Load, @@ -174,7 +172,7 @@ Module( arguments: Some( Arguments { range: 104..106, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [], keywords: [], }, @@ -182,11 +180,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..111, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..111, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap index 18801458d7..8ce68efabf 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/type_param_param_spec. ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..90, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,16 +25,16 @@ Module( type_params: Some( TypeParams { range: 6..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 7..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 9..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -44,7 +44,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("int"), ctx: Load, @@ -54,11 +54,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..41, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("X"), ctx: Store, @@ -67,21 +67,21 @@ Module( type_params: Some( TypeParams { range: 24..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ ParamSpec( TypeParamParamSpec { range: 25..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 27..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, id: Name("int"), ctx: Load, @@ -95,7 +95,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..41, id: Name("int"), ctx: Load, @@ -105,11 +105,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..62, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("X"), ctx: Store, @@ -118,16 +118,16 @@ Module( type_params: Some( TypeParams { range: 48..56, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 49..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 49..50, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -136,11 +136,11 @@ Module( ParamSpec( TypeParamParamSpec { range: 52..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 54..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -150,7 +150,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..62, id: Name("int"), ctx: Load, @@ -160,11 +160,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..89, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 68..69, id: Name("X"), ctx: Store, @@ -173,16 +173,16 @@ Module( type_params: Some( TypeParams { range: 69..83, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 70..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 70..71, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -191,16 +191,16 @@ Module( ParamSpec( TypeParamParamSpec { range: 73..82, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("P"), range: 75..76, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 79..82, id: Name("int"), ctx: Load, @@ -214,7 +214,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..89, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap index 1e340b41b1..39808ecfd6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/type_param_type_var.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..147, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..15, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,16 +25,16 @@ Module( type_params: Some( TypeParams { range: 6..9, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 7..8, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -45,7 +45,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 12..15, id: Name("int"), ctx: Load, @@ -55,11 +55,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 16..37, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 21..22, id: Name("X"), ctx: Store, @@ -68,22 +68,22 @@ Module( type_params: Some( TypeParams { range: 22..31, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 23..30, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 23..24, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 27..30, id: Name("int"), ctx: Load, @@ -97,7 +97,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 34..37, id: Name("int"), ctx: Load, @@ -107,11 +107,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..64, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..44, id: Name("X"), ctx: Store, @@ -120,21 +120,21 @@ Module( type_params: Some( TypeParams { range: 44..58, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 45..57, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 45..46, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..51, id: Name("int"), ctx: Load, @@ -144,7 +144,7 @@ Module( default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 54..57, id: Name("int"), ctx: Load, @@ -158,7 +158,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..64, id: Name("int"), ctx: Load, @@ -168,11 +168,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..98, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 70..71, id: Name("X"), ctx: Store, @@ -181,26 +181,26 @@ Module( type_params: Some( TypeParams { range: 71..92, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 72..91, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 72..73, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 75..85, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 76..79, id: Name("int"), ctx: Load, @@ -208,7 +208,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..84, id: Name("int"), ctx: Load, @@ -223,7 +223,7 @@ Module( default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..91, id: Name("int"), ctx: Load, @@ -237,7 +237,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..98, id: Name("int"), ctx: Load, @@ -247,11 +247,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 99..146, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..105, id: Name("X"), ctx: Store, @@ -260,21 +260,21 @@ Module( type_params: Some( TypeParams { range: 105..140, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 106..118, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 106..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 109..112, id: Name("int"), ctx: Load, @@ -284,7 +284,7 @@ Module( default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 115..118, id: Name("int"), ctx: Load, @@ -296,21 +296,21 @@ Module( TypeVar( TypeParamTypeVar { range: 120..139, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("U"), range: 120..121, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: Some( Tuple( ExprTuple { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 123..133, elts: [ Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 124..127, id: Name("int"), ctx: Load, @@ -318,7 +318,7 @@ Module( ), Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 129..132, id: Name("int"), ctx: Load, @@ -333,7 +333,7 @@ Module( default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 136..139, id: Name("int"), ctx: Load, @@ -347,7 +347,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 143..146, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap index aa50926d78..5aab990b65 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/type_param_type_var_tu ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..115, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..17, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 5..6, id: Name("X"), ctx: Store, @@ -25,16 +25,16 @@ Module( type_params: Some( TypeParams { range: 6..11, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 7..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 8..10, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -44,7 +44,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 14..17, id: Name("int"), ctx: Load, @@ -54,11 +54,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 18..41, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 23..24, id: Name("X"), ctx: Store, @@ -67,21 +67,21 @@ Module( type_params: Some( TypeParams { range: 24..35, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 25..34, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 26..28, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 31..34, id: Name("int"), ctx: Load, @@ -95,7 +95,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 38..41, id: Name("int"), ctx: Load, @@ -105,11 +105,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 42..66, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("X"), ctx: Store, @@ -118,25 +118,25 @@ Module( type_params: Some( TypeParams { range: 48..60, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVarTuple( TypeParamTypeVarTuple { range: 49..59, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 50..52, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Starred( ExprStarred { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..59, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..59, id: Name("int"), ctx: Load, @@ -153,7 +153,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 63..66, id: Name("int"), ctx: Load, @@ -163,11 +163,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..87, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 72..73, id: Name("X"), ctx: Store, @@ -176,16 +176,16 @@ Module( type_params: Some( TypeParams { range: 73..81, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 74..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 74..75, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -194,11 +194,11 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 77..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 78..80, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: None, }, @@ -208,7 +208,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..87, id: Name("int"), ctx: Load, @@ -218,11 +218,11 @@ Module( ), TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 88..114, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 93..94, id: Name("X"), ctx: Store, @@ -231,16 +231,16 @@ Module( type_params: Some( TypeParams { range: 94..108, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), type_params: [ TypeVar( TypeParamTypeVar { range: 95..96, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("T"), range: 95..96, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, bound: None, default: None, @@ -249,16 +249,16 @@ Module( TypeVarTuple( TypeParamTypeVarTuple { range: 98..107, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("Ts"), range: 99..101, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, default: Some( Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 104..107, id: Name("int"), ctx: Load, @@ -272,7 +272,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 111..114, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap index 7e590b4515..c1849f86cc 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/type_stmt_py312.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..57, body: [ TypeAlias( StmtTypeAlias { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..56, name: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, id: Name("x"), ctx: Store, @@ -25,7 +25,7 @@ Module( type_params: None, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..56, id: Name("int"), ctx: Load, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap index 92c7cefb86..1f121dbd2d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/unparenthesized_named_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..53, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..52, value: Subscript( ExprSubscript { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..52, value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..46, id: Name("lst"), ctx: Load, @@ -28,11 +28,11 @@ Module( ), slice: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..51, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 47..48, id: Name("x"), ctx: Store, @@ -40,7 +40,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 50..51, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap index 0f8b9f47b7..e95fef868f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap @@ -7,25 +7,25 @@ input_file: crates/ruff_python_parser/resources/inline/ok/unparenthesized_named_ ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..88, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..57, value: Set( ExprSet { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 43..57, elts: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..50, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, id: Name("x"), ctx: Store, @@ -33,7 +33,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 49..50, value: Int( 1, @@ -44,7 +44,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, value: Int( 2, @@ -53,7 +53,7 @@ Module( ), NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 55..56, value: Int( 3, @@ -67,19 +67,19 @@ Module( ), Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..87, value: SetComp( ExprSetComp { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 58..87, elt: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..68, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 59..63, id: Name("last"), ctx: Store, @@ -87,7 +87,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 67..68, id: Name("x"), ctx: Load, @@ -98,10 +98,10 @@ Module( generators: [ Comprehension { range: 69..86, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..74, id: Name("x"), ctx: Store, @@ -109,11 +109,11 @@ Module( ), iter: Call( ExprCall { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..86, func: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 78..83, id: Name("range"), ctx: Load, @@ -121,11 +121,11 @@ Module( ), arguments: Arguments { range: 83..86, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 84..85, value: Int( 3, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap index f4de814c8d..87c63be67c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap @@ -7,32 +7,32 @@ input_file: crates/ruff_python_parser/resources/inline/ok/valid_annotation_class ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..137, body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..23, decorator_list: [], name: Identifier { id: Name("F"), range: 6..7, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 7..18, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..17, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 8..9, id: Name("y"), ctx: Store, @@ -40,7 +40,7 @@ Module( ), value: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 13..17, id: Name("list"), ctx: Load, @@ -55,11 +55,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 20..23, }, ), @@ -70,21 +70,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 24..93, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 28..29, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 29..31, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -95,28 +93,28 @@ Module( body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 37..60, decorator_list: [], name: Identifier { id: Name("G"), range: 43..44, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 44..55, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..53, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 52..53, value: Int( 1, @@ -133,11 +131,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 57..60, }, ), @@ -148,27 +146,27 @@ Module( ), ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..93, decorator_list: [], name: Identifier { id: Name("H"), range: 71..72, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 72..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 74..86, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 85..86, value: Int( 1, @@ -184,11 +182,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..93, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..93, }, ), @@ -202,21 +200,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..136, is_async: true, decorator_list: [], name: Identifier { id: Name("f"), range: 104..105, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 105..107, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -227,27 +223,27 @@ Module( body: [ ClassDef( StmtClassDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 113..136, decorator_list: [], name: Identifier { id: Name("G"), range: 119..120, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, arguments: Some( Arguments { range: 120..131, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), args: [ Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..129, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, value: Int( 1, @@ -263,11 +259,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..136, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..136, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap index c1c32f5605..c70dedf89f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap @@ -7,26 +7,24 @@ input_file: crates/ruff_python_parser/resources/inline/ok/valid_annotation_funct ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..316, body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..68, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 48..49, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 49..51, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -36,11 +34,11 @@ Module( returns: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..62, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..57, id: Name("y"), ctx: Store, @@ -48,7 +46,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 61..62, value: Int( 3, @@ -61,11 +59,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..68, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 65..68, }, ), @@ -76,42 +74,40 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 69..94, is_async: false, decorator_list: [], name: Identifier { id: Name("g"), range: 73..74, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 74..89, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 75..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 75..88, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 75..78, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..87, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 81..82, id: Name("x"), ctx: Store, @@ -119,7 +115,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 86..87, value: Int( 1, @@ -141,11 +137,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..94, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 91..94, }, ), @@ -156,21 +152,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 95..235, is_async: false, decorator_list: [], name: Identifier { id: Name("outer"), range: 99..104, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 104..106, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -181,43 +175,41 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 112..136, is_async: false, decorator_list: [], name: Identifier { id: Name("i"), range: 116..117, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 117..131, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 118..130, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 118..130, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 118..119, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 122..129, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 128..129, value: Int( 1, @@ -240,11 +232,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..136, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 133..136, }, ), @@ -255,21 +247,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..166, is_async: false, decorator_list: [], name: Identifier { id: Name("k"), range: 145..146, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 146..148, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -279,12 +269,12 @@ Module( returns: Some( Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 153..160, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 159..160, value: Int( 1, @@ -298,11 +288,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..166, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 163..166, }, ), @@ -313,42 +303,40 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 171..200, is_async: false, decorator_list: [], name: Identifier { id: Name("m"), range: 175..176, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 176..195, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 177..194, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 177..194, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("x"), range: 177..178, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 181..193, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 192..193, value: Int( 1, @@ -370,11 +358,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..200, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 197..200, }, ), @@ -385,21 +373,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 205..235, is_async: false, decorator_list: [], name: Identifier { id: Name("o"), range: 209..210, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 210..212, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -409,11 +395,11 @@ Module( returns: Some( YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 217..229, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 228..229, value: Int( 1, @@ -426,11 +412,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..235, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 232..235, }, ), @@ -444,21 +430,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 236..315, is_async: true, decorator_list: [], name: Identifier { id: Name("outer"), range: 246..251, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 251..253, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -469,21 +453,19 @@ Module( body: [ FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 259..284, is_async: false, decorator_list: [], name: Identifier { id: Name("f"), range: 263..264, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 264..266, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -493,11 +475,11 @@ Module( returns: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 271..278, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 277..278, value: Int( 1, @@ -510,11 +492,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..284, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 281..284, }, ), @@ -525,42 +507,40 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 289..315, is_async: false, decorator_list: [], name: Identifier { id: Name("g"), range: 293..294, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 294..310, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [ ParameterWithDefault { range: 295..309, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), parameter: Parameter { range: 295..309, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), name: Identifier { id: Name("arg"), range: 295..298, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, annotation: Some( Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 301..308, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 307..308, value: Int( 1, @@ -582,11 +562,11 @@ Module( body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..315, value: EllipsisLiteral( ExprEllipsisLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 312..315, }, ), diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap index be4b3961e8..b8f364cf8b 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap @@ -7,16 +7,16 @@ input_file: crates/ruff_python_parser/resources/inline/ok/valid_annotation_py313 ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..144, body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..55, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 44..45, id: Name("a"), ctx: Store, @@ -24,11 +24,11 @@ Module( ), annotation: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..54, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 48..49, id: Name("x"), ctx: Store, @@ -36,7 +36,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 53..54, value: Int( 1, @@ -51,21 +51,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 56..107, is_async: false, decorator_list: [], name: Identifier { id: Name("outer"), range: 60..65, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 65..67, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -76,11 +74,11 @@ Module( body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..85, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 73..74, id: Name("b"), ctx: Store, @@ -88,12 +86,12 @@ Module( ), annotation: Yield( ExprYield { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 77..84, value: Some( NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 83..84, value: Int( 1, @@ -109,11 +107,11 @@ Module( ), AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..107, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 90..91, id: Name("c"), ctx: Store, @@ -121,11 +119,11 @@ Module( ), annotation: YieldFrom( ExprYieldFrom { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 94..106, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 105..106, value: Int( 1, @@ -143,21 +141,19 @@ Module( ), FunctionDef( StmtFunctionDef { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 108..143, is_async: true, decorator_list: [], name: Identifier { id: Name("outer"), range: 118..123, - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), }, type_params: None, parameters: Parameters { range: 123..125, - node_index: AtomicNodeIndex( - 0, - ), + node_index: NodeIndex(None), posonlyargs: [], args: [], vararg: None, @@ -168,11 +164,11 @@ Module( body: [ AnnAssign( StmtAnnAssign { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..143, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 131..132, id: Name("d"), ctx: Store, @@ -180,11 +176,11 @@ Module( ), annotation: Await( ExprAwait { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 135..142, value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 141..142, value: Int( 1, diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap index 16008f3821..0dba7ff0cd 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap @@ -7,20 +7,20 @@ input_file: crates/ruff_python_parser/resources/inline/ok/walrus_py38.py ``` Module( ModModule { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 0..54, body: [ Expr( StmtExpr { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 45..53, value: Named( ExprNamed { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..52, target: Name( ExprName { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 46..47, id: Name("x"), ctx: Store, @@ -28,7 +28,7 @@ Module( ), value: NumberLiteral( ExprNumberLiteral { - node_index: AtomicNodeIndex(..), + node_index: NodeIndex(None), range: 51..52, value: Int( 1, diff --git a/crates/ty_python_semantic/src/ast_node_ref.rs b/crates/ty_python_semantic/src/ast_node_ref.rs index c5f7f115cc..9d1dd60433 100644 --- a/crates/ty_python_semantic/src/ast_node_ref.rs +++ b/crates/ty_python_semantic/src/ast_node_ref.rs @@ -32,17 +32,19 @@ use ruff_text_size::Ranged; /// run on every AST change. All other queries only run when the expression's identity changes. #[derive(Clone)] pub struct AstNodeRef { - /// A pointer to the [`ruff_db::parsed::ParsedModule`] that this node was created from. - module_ptr: *const (), + /// The index of the node in the AST. + index: NodeIndex, /// Debug information. #[cfg(debug_assertions)] kind: ruff_python_ast::NodeKind, #[cfg(debug_assertions)] range: ruff_text_size::TextRange, - - /// The index of the node in the AST. - index: NodeIndex, + // Note that because the module address is not stored in release builds, `AstNodeRef` + // cannot implement `Eq`, as indices are only unique within a given instance of the + // AST. + #[cfg(debug_assertions)] + module_addr: usize, _node: PhantomData, } @@ -63,7 +65,8 @@ where Self { index, - module_ptr: module_ref.module().as_ptr(), + #[cfg(debug_assertions)] + module_addr: module_ref.module().addr(), #[cfg(debug_assertions)] kind: AnyNodeRef::from(node).kind(), #[cfg(debug_assertions)] @@ -77,10 +80,11 @@ where /// This method may panic or produce unspecified results if the provided module is from a /// different file or Salsa revision than the module to which the node belongs. pub fn node<'ast>(&self, module_ref: &'ast ParsedModuleRef) -> &'ast T { - debug_assert_eq!(module_ref.module().as_ptr(), self.module_ptr); + #[cfg(debug_assertions)] + assert_eq!(module_ref.module().addr(), self.module_addr); - // Note that the module pointer is guaranteed to be stable within the Salsa - // revision, so the file contents cannot have changed by the above assertion. + // The user guarantees that the module is from the same file and Salsa + // revision, so the file contents cannot have changed. module_ref .get_by_index(self.index) .try_into() @@ -89,6 +93,20 @@ where } } +#[expect(unsafe_code)] +unsafe impl salsa::Update for AstNodeRef { + unsafe fn maybe_update(old_pointer: *mut Self, new_value: Self) -> bool { + let old_ref = unsafe { &mut (*old_pointer) }; + + // The equality of an `AstNodeRef` depends on both the module address and the node index, + // but the former is not stored in release builds to save memory. As such, AST nodes + // are always considered change when the AST is reparsed, which is acceptable because + // any change to the AST is likely to invalidate most node indices anyways. + *old_ref = new_value; + true + } +} + impl get_size2::GetSize for AstNodeRef {} #[allow(clippy::missing_fields_in_debug)] @@ -113,26 +131,3 @@ where } } } - -#[expect(unsafe_code)] -unsafe impl salsa::Update for AstNodeRef { - unsafe fn maybe_update(old_pointer: *mut Self, new_value: Self) -> bool { - let old_ref = unsafe { &mut (*old_pointer) }; - - // Two nodes are guaranteed to be equal as long as they refer to the same node index - // within the same module. Note that the module pointer is guaranteed to be stable - // within the Salsa revision, so the file contents cannot have changed. - if old_ref.module_ptr == new_value.module_ptr && old_ref.index == new_value.index { - false - } else { - *old_ref = new_value; - true - } - } -} - -// SAFETY: The `module_ptr` is only used for pointer equality and never accessed directly. -#[expect(unsafe_code)] -unsafe impl Send for AstNodeRef where T: Send {} -#[expect(unsafe_code)] -unsafe impl Sync for AstNodeRef where T: Sync {}