Move range from Attributed to Nodes (#22)

* Move `range` from `Attributed` to `Node`s

* No Attributed + custom for Range PoC

* Generate all located variants, generate enum implementations

* Implement `Copy` on simple enums

* Move `Suite` to `ranged` and `located`

* Update tests
---------

Co-authored-by: Jeong YunWon <jeong@youknowone.org>

Cargo.toml

@@ -17,7 +17,7 @@ members = [
 
 [workspace.dependencies]
 rustpython-ast = { path = "ast", default-features = false }
-rustpython-parser-core = { path = "core", default-features = false }
+rustpython-parser-core = { path = "core", features = [] }
 rustpython-literal = { path = "literal" }
 
 ahash = "0.7.6"

ast/Cargo.toml

@@ -14,6 +14,7 @@ location = ["fold", "rustpython-parser-core/location"]
 fold = []
 unparse = ["rustpython-literal"]
 visitor = []
+all-nodes-with-ranges = []
 
 [dependencies]
 rustpython-parser-core = { workspace = true }
@@ -21,3 +22,4 @@ rustpython-literal = { workspace = true, optional = true }
 
 is-macro = { workspace = true }
 num-bigint = { workspace = true }
+static_assertions = "1.1.0"

ast/asdl_rs.py

@@ -1,6 +1,6 @@
 # spell-checker:words dfn dfns
 
-#! /usr/bin/env python
+# ! /usr/bin/env python
 """Generate Rust code from an ASDL description."""
 
 import sys
@@ -84,6 +84,7 @@ class TypeInfo:
     enum_name: Optional[str]
     has_user_data: Optional[bool]
     has_attributes: bool
+    is_simple: bool
     empty_field: bool
     children: set
     boxed: bool
@@ -95,6 +96,7 @@ class TypeInfo:
         self.enum_name = None
         self.has_user_data = None
         self.has_attributes = False
+        self.is_simple = False
         self.empty_field = False
         self.children = set()
         self.boxed = False
@@ -104,6 +106,14 @@ class TypeInfo:
     def __repr__(self):
         return f"<TypeInfo: {self.name}>"
 
+    def no_cfg(self, typeinfo):
+        if self.product:
+            return self.has_attributes
+        elif self.enum_name:
+            return typeinfo[self.enum_name].has_attributes
+        else:
+            return self.has_attributes
+
     @property
     def rust_name(self):
         return rust_type_name(self.name)
@@ -124,19 +134,6 @@ class TypeInfo:
             name = rust_type_name(self.enum_name) + rust_name
             return name
 
-    @property
-    def rust_suffix(self):
-        if self.product:
-            if self.has_attributes:
-                return "Data"
-            else:
-                return ""
-        else:
-            if self.has_attributes:
-                return "Kind"
-            else:
-                return ""
-
     def determine_user_data(self, type_info, stack):
         if self.name in stack:
             return None
@@ -160,7 +157,8 @@ class TypeInfoMixin:
         return self.type_info[typ].has_user_data
 
     def apply_generics(self, typ, *generics):
-        if self.has_user_data(typ):
+        needs_generics = not self.type_info[typ].is_simple
+        if needs_generics:
             return [f"<{g}>" for g in generics]
         else:
             return ["" for g in generics]
@@ -208,6 +206,7 @@ class FindUserDataTypesVisitor(asdl.VisitorBase):
         info = self.type_info[name]
         if is_simple(sum):
             info.has_user_data = False
+            info.is_simple = True
         else:
             for t in sum.types:
                 t_info = TypeInfo(t.name)
@@ -218,7 +217,7 @@ class FindUserDataTypesVisitor(asdl.VisitorBase):
             if len(sum.types) > 1:
                 info.boxed = True
             if sum.attributes:
-                # attributes means located, which has the `custom: U` field
+                # attributes means located, which has the `range: R` field
                 info.has_user_data = True
                 info.has_attributes = True
 
@@ -228,7 +227,7 @@ class FindUserDataTypesVisitor(asdl.VisitorBase):
     def visitProduct(self, product, name):
         info = self.type_info[name]
         if product.attributes:
-            # attributes means located, which has the `custom: U` field
+            # attributes means located, which has the `range: R` field
             info.has_user_data = True
             info.has_attributes = True
         info.has_expr = product_has_expr(product)
@@ -277,10 +276,16 @@ class StructVisitor(EmitVisitor):
     def emit_attrs(self, depth):
         self.emit("#[derive(Clone, Debug, PartialEq)]", depth)
 
+    def emit_range(self, has_attributes, depth):
+        if has_attributes:
+            self.emit("pub range: R,", depth + 1)
+        else:
+            self.emit("pub range: crate::ranged::OptionalRange<R>,", depth + 1)
+
     def simple_sum(self, sum, name, depth):
         rust_name = rust_type_name(name)
         self.emit_attrs(depth)
-        self.emit("#[derive(is_macro::Is)]", depth)
+        self.emit("#[derive(is_macro::Is, Copy, Hash, Eq)]", depth)
         self.emit(f"pub enum {rust_name} {{", depth)
         for variant in sum.types:
             self.emit(f"{variant.name},", depth + 1)
@@ -289,20 +294,16 @@ class StructVisitor(EmitVisitor):
 
     def sum_with_constructors(self, sum, name, depth):
         type_info = self.type_info[name]
-        suffix = type_info.rust_suffix
         rust_name = rust_type_name(name)
         # all the attributes right now are for location, so if it has attrs we
         # can just wrap it in Attributed<>
 
         for t in sum.types:
-            if not t.fields:
-                continue
             self.sum_subtype_struct(type_info, t, rust_name, depth)
 
-        generics, generics_applied = self.apply_generics(name, "U = ()", "U")
         self.emit_attrs(depth)
         self.emit("#[derive(is_macro::Is)]", depth)
-        self.emit(f"pub enum {rust_name}{suffix}{generics} {{", depth)
+        self.emit(f"pub enum {rust_name}<R = TextRange> {{", depth)
         needs_escape = any(rust_field_name(t.name) in RUST_KEYWORDS for t in sum.types)
         for t in sum.types:
             if needs_escape:
@@ -310,35 +311,29 @@ class StructVisitor(EmitVisitor):
                     f'#[is(name = "{rust_field_name(t.name)}_{rust_name.lower()}")]',
                     depth + 1,
                 )
-            if t.fields:
-                (t_generics_applied,) = self.apply_generics(t.name, "U")
-                self.emit(
-                    f"{t.name}({rust_name}{t.name}{t_generics_applied}),", depth + 1
-                )
-            else:
-                self.emit(f"{t.name},", depth + 1)
+            self.emit(f"{t.name}({rust_name}{t.name}<R>),", depth + 1)
         self.emit("}", depth)
-        if type_info.has_attributes:
-            self.emit(
-                f"pub type {rust_name}<U = ()> = Attributed<{rust_name}{suffix}{generics_applied}, U>;",
-                depth,
-            )
         self.emit("", depth)
 
     def sum_subtype_struct(self, sum_type_info, t, rust_name, depth):
         self.emit_attrs(depth)
-        generics, generics_applied = self.apply_generics(t.name, "U = ()", "U")
         payload_name = f"{rust_name}{t.name}"
-        self.emit(f"pub struct {payload_name}{generics} {{", depth)
+        self.emit(f"pub struct {payload_name}<R = TextRange> {{", depth)
+        self.emit_range(sum_type_info.has_attributes, depth)
         for f in t.fields:
             self.visit(f, sum_type_info, "pub ", depth + 1, t.name)
+
+        assert sum_type_info.has_attributes == self.type_info[t.name].no_cfg(
+            self.type_info
+        )
+
         self.emit("}", depth)
         self.emit(
             textwrap.dedent(
                 f"""
-                impl{generics_applied} From<{payload_name}{generics_applied}> for {rust_name}{sum_type_info.rust_suffix}{generics_applied} {{
-                    fn from(payload: {payload_name}{generics_applied}) -> Self {{
-                        {rust_name}{sum_type_info.rust_suffix}::{t.name}(payload)
+                impl<R> From<{payload_name}<R>> for {rust_name}<R> {{
+                    fn from(payload: {payload_name}<R>) -> Self {{
+                        {rust_name}::{t.name}(payload)
                     }}
                 }}
                 """
@@ -346,6 +341,8 @@ class StructVisitor(EmitVisitor):
             depth,
         )
 
+        self.emit("", depth)
+
     def visitConstructor(self, cons, parent, depth):
         if cons.fields:
             self.emit(f"{cons.name} {{", depth)
@@ -358,21 +355,21 @@ class StructVisitor(EmitVisitor):
     def visitField(self, field, parent, vis, depth, constructor=None):
         typ = rust_type_name(field.type)
         field_type = self.type_info.get(field.type)
-        if field_type and field_type.has_user_data:
-            typ = f"{typ}<U>"
+        if field_type and not field_type.is_simple:
+            typ = f"{typ}<R>"
         # don't box if we're doing Vec<T>, but do box if we're doing Vec<Option<Box<T>>>
         if (
-            field_type
-            and field_type.boxed
-            and (not (parent.product or field.seq) or field.opt)
+                field_type
+                and field_type.boxed
+                and (not (parent.product or field.seq) or field.opt)
         ):
             typ = f"Box<{typ}>"
         if field.opt or (
-            # When a dictionary literal contains dictionary unpacking (e.g., `{**d}`),
-            # the expression to be unpacked goes in `values` with a `None` at the corresponding
-            # position in `keys`. To handle this, the type of `keys` needs to be `Option<Vec<T>>`.
-            constructor == "Dict"
-            and field.name == "keys"
+                # When a dictionary literal contains dictionary unpacking (e.g., `{**d}`),
+                # the expression to be unpacked goes in `values` with a `None` at the corresponding
+                # position in `keys`. To handle this, the type of `keys` needs to be `Option<Vec<T>>`.
+                constructor == "Dict"
+                and field.name == "keys"
         ):
             typ = f"Option<{typ}>"
         if field.seq:
@@ -384,28 +381,15 @@ class StructVisitor(EmitVisitor):
 
     def visitProduct(self, product, name, depth):
         type_info = self.type_info[name]
-        generics, generics_applied = self.apply_generics(name, "U = ()", "U")
-        data_name = rust_name = rust_type_name(name)
-        if product.attributes:
-            data_name = rust_name + "Data"
+        product_name = rust_type_name(name)
         self.emit_attrs(depth)
-        has_expr = product_has_expr(product)
-        if has_expr:
-            data_def = f"{data_name}{generics}"
-        else:
-            data_def = data_name
-        self.emit(f"pub struct {data_def} {{", depth)
+
+        self.emit(f"pub struct {product_name}<R = TextRange> {{", depth)
         for f in product.fields:
             self.visit(f, type_info, "pub ", depth + 1)
+        assert bool(product.attributes) == type_info.no_cfg(self.type_info)
+        self.emit_range(product.attributes, depth + 1)
         self.emit("}", depth)
-        if product.attributes:
-            # attributes should just be location info
-            if not has_expr:
-                generics_applied = ""
-            self.emit(
-                f"pub type {rust_name}<U = ()> = Attributed<{data_name}{generics_applied}, U>;",
-                depth,
-            )
         self.emit("", depth)
 
 
@@ -414,16 +398,18 @@ class FoldTraitDefVisitor(EmitVisitor):
         self.emit("pub trait Fold<U> {", depth)
         self.emit("type TargetU;", depth + 1)
         self.emit("type Error;", depth + 1)
-        self.emit(
-            "fn map_user(&mut self, user: U) -> Result<Self::TargetU, Self::Error>;",
-            depth + 1,
-        )
         self.emit(
             """
-            fn map_attributed<T>(&mut self, attributed: Attributed<T, U>) -> Result<Attributed<T, Self::TargetU>, Self::Error> {
-                let custom = self.map_user(attributed.custom)?;
-                Ok(Attributed { range: attributed.range, custom, node: attributed.node })
-            }""",
+            fn map_user(&mut self, user: U) -> Result<Self::TargetU, Self::Error>;
+            #[cfg(feature = "all-nodes-with-ranges")]
+            fn map_user_cfg(&mut self, user: U) -> Result<Self::TargetU, Self::Error> {
+                self.map_user(user)
+            }
+            #[cfg(not(feature = "all-nodes-with-ranges"))]
+            fn map_user_cfg(&mut self, _user: crate::EmptyRange<U>) -> Result<crate::EmptyRange<Self::TargetU>, Self::Error> {
+                Ok(crate::EmptyRange::default())
+            }
+            """,
             depth + 1,
         )
         self.emit(
@@ -451,15 +437,6 @@ class FoldTraitDefVisitor(EmitVisitor):
 
 class FoldImplVisitor(EmitVisitor):
     def visitModule(self, mod, depth):
-        self.emit(
-            "fn fold_attributed<U, F: Fold<U> + ?Sized, T, MT>(folder: &mut F, node: Attributed<T, U>, f: impl FnOnce(&mut F, T) -> Result<MT, F::Error>) -> Result<Attributed<MT, F::TargetU>, F::Error> {",
-            depth,
-        )
-        self.emit(
-            "let node = folder.map_attributed(node)?; Ok(Attributed { custom: node.custom, range: node.range, node: f(folder, node.node)? })",
-            depth + 1,
-        )
-        self.emit("}", depth)
         for dfn in mod.dfns:
             self.visit(dfn, depth)
 
@@ -472,6 +449,7 @@ class FoldImplVisitor(EmitVisitor):
             name, "T", "U", "F::TargetU"
         )
         enum_name = rust_type_name(name)
+        simple = is_simple(sum)
 
         self.emit(f"impl<T, U> Foldable<T, U> for {enum_name}{apply_t} {{", depth)
         self.emit(f"type Mapped = {enum_name}{apply_u};", depth + 1)
@@ -487,25 +465,29 @@ class FoldImplVisitor(EmitVisitor):
             f"pub fn fold_{name}<U, F: Fold<U> + ?Sized>(#[allow(unused)] folder: &mut F, node: {enum_name}{apply_u}) -> Result<{enum_name}{apply_target_u}, F::Error> {{",
             depth,
         )
-        if type_info.has_attributes:
-            self.emit("fold_attributed(folder, node, |folder, node| {", depth)
+
+        if simple:
+            self.emit("Ok(node) }", depth + 1)
+            return
 
         self.emit("match node {", depth + 1)
         for cons in sum.types:
-            fields_pattern = self.make_pattern(
-                enum_name, type_info.rust_suffix, cons.name, cons.fields
-            )
+            fields_pattern = self.make_pattern(enum_name, cons.name, cons.fields)
             self.emit(
-                f"{fields_pattern[0]} {{ {fields_pattern[1]} }} {fields_pattern[2]} => {{",
+                f"{fields_pattern[0]} {{ {fields_pattern[1]}}} {fields_pattern[2]} => {{",
                 depth + 2,
             )
+
+            map_user_suffix = "" if type_info.has_attributes else "_cfg"
+            self.emit(
+                f"let range = folder.map_user{map_user_suffix}(range)?;", depth + 3
+            )
+
             self.gen_construction(
                 fields_pattern[0], cons.fields, fields_pattern[2], depth + 3
             )
             self.emit("}", depth + 2)
         self.emit("}", depth + 1)
-        if type_info.has_attributes:
-            self.emit("})", depth)
         self.emit("}", depth)
 
     def visitProduct(self, product, name, depth):
@@ -529,27 +511,26 @@ class FoldImplVisitor(EmitVisitor):
             f"pub fn fold_{name}<U, F: Fold<U> + ?Sized>(#[allow(unused)] folder: &mut F, node: {struct_name}{apply_u}) -> Result<{struct_name}{apply_target_u}, F::Error> {{",
             depth,
         )
-        if has_attributes:
-            self.emit("fold_attributed(folder, node, |folder, node| {", depth)
-            rust_name = struct_name + "Data"
-        else:
-            rust_name = struct_name
-        fields_pattern = self.make_pattern(rust_name, struct_name, None, product.fields)
-        self.emit(f"let {rust_name} {{ {fields_pattern[1]} }} = node;", depth + 1)
-        self.gen_construction(rust_name, product.fields, "", depth + 1)
-        if has_attributes:
-            self.emit("})", depth)
+
+        fields_pattern = self.make_pattern(struct_name, struct_name, product.fields)
+        self.emit(f"let {struct_name} {{ {fields_pattern[1]} }} = node;", depth + 1)
+
+        map_user_suffix = "" if has_attributes else "_cfg"
+        self.emit(f"let range = folder.map_user{map_user_suffix}(range)?;", depth + 3)
+
+        self.gen_construction(struct_name, product.fields, "", depth + 1)
+
         self.emit("}", depth)
 
-    def make_pattern(self, rust_name, suffix, fieldname, fields):
-        if fields:
-            header = f"{rust_name}{suffix}::{fieldname}({rust_name}{fieldname}"
-            footer = ")"
-        else:
-            header = f"{rust_name}{suffix}::{fieldname}"
-            footer = ""
+    def make_pattern(self, rust_name, fieldname: str, fields):
+        header = f"{rust_name}::{fieldname}({rust_name}{fieldname}"
+        footer = ")"
 
         body = ",".join(rust_field(f.name) for f in fields)
+        if body:
+            body += ","
+        body += "range"
+
         return header, body, footer
 
     def gen_construction(self, header, fields, footer, depth):
@@ -557,6 +538,8 @@ class FoldImplVisitor(EmitVisitor):
         for field in fields:
             name = rust_field(field.name)
             self.emit(f"{name}: Foldable::fold({name}, folder)?,", depth + 1)
+        self.emit("range,", depth + 1)
+
         self.emit(f"}}{footer})", depth)
 
 
@@ -584,7 +567,7 @@ class VisitorTraitDefVisitor(StructVisitor):
             return rust_type_name(name)
 
     def visitModule(self, mod, depth):
-        self.emit("pub trait Visitor<U=()> {", depth)
+        self.emit("pub trait Visitor<R=crate::text_size::TextRange> {", depth)
 
         for dfn in mod.dfns:
             self.visit(dfn, depth + 1)
@@ -595,16 +578,14 @@ class VisitorTraitDefVisitor(StructVisitor):
 
     def emit_visitor(self, nodename, depth, has_node=True):
         type_info = self.type_info[nodename]
-        if has_node:
-            node_type = type_info.rust_sum_name
-            node_value = "node"
-        else:
-            node_type = "()"
-            node_value = "()"
+        node_type = type_info.rust_sum_name
+        generic, = self.apply_generics(nodename, "R")
         self.emit(
-            f"fn visit_{type_info.sum_name}(&mut self, node: {node_type}) {{", depth
+            f"fn visit_{type_info.sum_name}(&mut self, node: {node_type}{generic}) {{", depth
         )
-        self.emit(f"self.generic_visit_{type_info.sum_name}({node_value})", depth + 1)
+        if has_node:
+            self.emit(f"self.generic_visit_{type_info.sum_name}(node)", depth + 1)
+
         self.emit("}", depth)
 
     def emit_generic_visitor_signature(self, nodename, depth, has_node=True):
@@ -613,8 +594,9 @@ class VisitorTraitDefVisitor(StructVisitor):
             node_type = type_info.rust_sum_name
         else:
             node_type = "()"
+        generic, = self.apply_generics(nodename, "R")
         self.emit(
-            f"fn generic_visit_{type_info.sum_name}(&mut self, node: {node_type}) {{",
+            f"fn generic_visit_{type_info.sum_name}(&mut self, node: {node_type}{generic}) {{",
             depth,
         )
 
@@ -628,16 +610,15 @@ class VisitorTraitDefVisitor(StructVisitor):
 
     def visit_match_for_type(self, nodename, rust_name, type_, depth):
         self.emit(f"{rust_name}::{type_.name}", depth)
-        if type_.fields:
-            self.emit("(data)", depth)
-            data = "data"
-        else:
-            data = "()"
-        self.emit(f"=> self.visit_{nodename}_{type_.name}({data}),", depth)
+        self.emit("(data)", depth)
+        self.emit(f"=> self.visit_{nodename}_{type_.name}(data),", depth)
 
     def visit_sum_type(self, name, type_, depth):
         self.emit_visitor(type_.name, depth, has_node=type_.fields)
-        self.emit_generic_visitor_signature(type_.name, depth, has_node=type_.fields)
+        if not type_.fields:
+            return
+
+        self.emit_generic_visitor_signature(type_.name, depth, has_node=True)
         for f in type_.fields:
             fieldname = rust_field(f.name)
             field_type = self.type_info.get(f.type)
@@ -669,15 +650,13 @@ class VisitorTraitDefVisitor(StructVisitor):
         if not sum.attributes:
             return
 
-        rust_name = enum_name = rust_type_name(name)
-        if sum.attributes:
-            rust_name = enum_name + "Kind"
+        enum_name = rust_type_name(name)
         self.emit_visitor(name, depth)
         self.emit_generic_visitor_signature(name, depth)
         depth += 1
-        self.emit("match node.node {", depth)
+        self.emit("match node {", depth)
         for t in sum.types:
-            self.visit_match_for_type(name, rust_name, t, depth + 1)
+            self.visit_match_for_type(name, enum_name, t, depth + 1)
         self.emit("}", depth)
         depth -= 1
         self.emit("}", depth)
@@ -838,8 +817,6 @@ class TraitImplVisitor(EmitVisitor):
 
     def visitProduct(self, product, name, depth):
         struct_name = rust_type_name(name)
-        if product.attributes:
-            struct_name += "Data"
 
         self.emit(f"impl NamedNode for ast::located::{struct_name} {{", depth)
         self.emit(f"const NAME: &'static str = {json.dumps(name)};", depth + 1)
@@ -945,6 +922,124 @@ class TraitImplVisitor(EmitVisitor):
             return f"Node::ast_from_object(_vm, get_node_field(_vm, &_object, {name}, {json.dumps(typename)})?)?"
 
 
+class RangedDefVisitor(EmitVisitor):
+    def visitModule(self, mod):
+        for dfn in mod.dfns:
+            self.visit(dfn)
+
+    def visitType(self, type, depth=0):
+        self.visit(type.value, type.name, depth)
+
+    def visitSum(self, sum, name, depth):
+        info = self.type_info[name]
+
+        if info.is_simple:
+            return
+
+        sum_match_arms = ""
+
+        for ty in sum.types:
+            variant_info = self.type_info[ty.name]
+            sum_match_arms += f"        Self::{variant_info.rust_name}(node) => node.range(),"
+            self.emit_ranged_impl(variant_info)
+
+        if not info.no_cfg(self.type_info):
+            self.emit('#[cfg(feature = "all-nodes-with-ranges")]', 0)
+
+        self.emit(f"""
+        impl Ranged for crate::{info.rust_sum_name} {{
+            fn range(&self) -> TextRange {{
+                match self {{
+                    {sum_match_arms}
+                }}
+            }}
+        }}
+        """.lstrip(), 0)
+
+    def visitProduct(self, product, name, depth):
+        info = self.type_info[name]
+
+        self.emit_ranged_impl(info)
+
+    def emit_ranged_impl(self, info):
+        if not info.no_cfg(self.type_info):
+            self.emit('#[cfg(feature = "all-nodes-with-ranges")]', 0)
+
+        self.file.write(
+            f"""
+            impl Ranged for crate::generic::{info.rust_sum_name}::<TextRange> {{
+                fn range(&self) -> TextRange {{
+                    self.range
+                }}
+            }}
+            """.strip()
+        )
+
+
+class LocatedDefVisitor(EmitVisitor):
+    def visitModule(self, mod):
+        for dfn in mod.dfns:
+            self.visit(dfn)
+
+    def visitType(self, type, depth=0):
+        self.visit(type.value, type.name, depth)
+
+    def visitSum(self, sum, name, depth):
+        info = self.type_info[name]
+
+        self.emit_type_alias(info)
+
+        if info.is_simple:
+            return
+
+        sum_match_arms = ""
+
+        for ty in sum.types:
+            variant_info = self.type_info[ty.name]
+            sum_match_arms += f"        Self::{variant_info.rust_name}(node) => node.range(),"
+            self.emit_type_alias(variant_info)
+            self.emit_located_impl(variant_info)
+
+        if not info.no_cfg(self.type_info):
+            self.emit('#[cfg(feature = "all-nodes-with-ranges")]', 0)
+
+        self.emit(f"""
+        impl Located for {info.rust_sum_name} {{
+            fn range(&self) -> SourceRange {{
+                match self {{
+                    {sum_match_arms}
+                }}
+            }}
+        }}
+        """.lstrip(), 0)
+
+    def visitProduct(self, product, name, depth):
+        info = self.type_info[name]
+
+        self.emit_type_alias(info)
+        self.emit_located_impl(info)
+
+    def emit_type_alias(self, info):
+        generics = "" if info.is_simple else "::<SourceRange>"
+
+        self.emit(f"pub type {info.rust_sum_name} = crate::generic::{info.rust_sum_name}{generics};", 0)
+        self.emit("", 0)
+
+    def emit_located_impl(self, info):
+        if not info.no_cfg(self.type_info):
+            self.emit('#[cfg(feature = "all-nodes-with-ranges")]', 0)
+
+        self.emit(
+            f"""
+            impl Located for {info.rust_sum_name} {{
+                fn range(&self) -> SourceRange {{
+                    self.range
+                }}
+            }}
+            """
+            , 0)
+
+
 class ChainOfVisitors:
     def __init__(self, *visitors):
         self.visitors = visitors
@@ -956,6 +1051,7 @@ class ChainOfVisitors:
 
 
 def write_ast_def(mod, type_info, f):
+    f.write("use crate::text_size::TextRange;")
     StructVisitor(f, type_info).visit(mod)
 
 
@@ -967,32 +1063,12 @@ def write_visitor_def(mod, type_info, f):
     VisitorModuleVisitor(f, type_info).visit(mod)
 
 
-def write_located_def(mod, type_info, f):
-    f.write(
-        textwrap.dedent(
-            """
-            use rustpython_parser_core::source_code::SourceRange;
+def write_ranged_def(mod, type_info, f):
+    RangedDefVisitor(f, type_info).visit(mod)
 
-            pub type Located<T> = super::generic::Attributed<T, SourceRange>;
-            """
-        )
-    )
-    for info in type_info.values():
-        if info.empty_field:
-            continue
-        if info.has_user_data:
-            generics = "::<SourceRange>"
-        else:
-            generics = ""
-        f.write(
-            f"pub type {info.rust_sum_name} = super::generic::{info.rust_sum_name}{generics};\n"
-        )
-        if info.rust_suffix:
-            if info.rust_suffix == "Data" and not info.has_expr:
-                generics = ""
-            f.write(
-                f"pub type {info.rust_sum_name}{info.rust_suffix} = super::generic::{info.rust_sum_name}{info.rust_suffix}{generics};\n"
-            )
+
+def write_located_def(mod, type_info, f):
+    LocatedDefVisitor(f, type_info).visit(mod)
 
 
 def write_ast_mod(mod, type_info, f):
@@ -1016,10 +1092,10 @@ def write_ast_mod(mod, type_info, f):
 
 
 def main(
-    input_filename,
-    ast_dir,
-    module_filename,
-    dump_module=False,
+        input_filename,
+        ast_dir,
+        module_filename,
+        dump_module=False,
 ):
     auto_gen_msg = AUTO_GEN_MESSAGE.format("/".join(Path(__file__).parts[-2:]))
     mod = asdl.parse(input_filename)
@@ -1035,6 +1111,7 @@ def main(
     for filename, write in [
         ("generic", write_ast_def),
         ("fold", write_fold_def),
+        ("ranged", write_ranged_def),
         ("located", write_located_def),
         ("visitor", write_visitor_def),
     ]:

ast/src/builtin.rs

@@ -1,7 +1,6 @@
 //! `builtin_types` in asdl.py and Attributed
 
 use num_bigint::BigInt;
-use rustpython_parser_core::text_size::{TextRange, TextSize};
 
 pub type String = std::string::String;
 
@@ -205,64 +204,6 @@ impl std::fmt::Display for Constant {
     }
 }
 
-#[derive(Clone, Debug, PartialEq)]
-pub struct Attributed<T, U = ()> {
-    pub range: TextRange,
-    pub custom: U,
-    pub node: T,
-}
-
-impl<T, U> Attributed<T, U> {
-    /// Returns the node
-    #[inline]
-    pub fn node(&self) -> &T {
-        &self.node
-    }
-
-    /// Returns the `range` of the node. The range offsets are absolute to the start of the document.
-    #[inline]
-    pub const fn range(&self) -> TextRange {
-        self.range
-    }
-
-    /// Returns the absolute start position of the node from the beginning of the document.
-    #[inline]
-    pub const fn start(&self) -> TextSize {
-        self.range.start()
-    }
-
-    /// Returns the absolute position at which the node ends in the source document.
-    #[inline]
-    pub const fn end(&self) -> TextSize {
-        self.range.end()
-    }
-}
-
-impl<T> Attributed<T, ()> {
-    /// Creates a new node that spans the position specified by `range`.
-    pub fn new(range: impl Into<TextRange>, node: impl Into<T>) -> Self {
-        Self {
-            range: range.into(),
-            custom: (),
-            node: node.into(),
-        }
-    }
-
-    /// Consumes self and returns the node.
-    #[inline]
-    pub fn into_node(self) -> T {
-        self.node
-    }
-}
-
-impl<T, U> std::ops::Deref for Attributed<T, U> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        &self.node
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

ast/src/gen/located.rs

@@ -1,95 +1,753 @@
 // File automatically generated by ast/asdl_rs.py.
 
-use rustpython_parser_core::source_code::SourceRange;
+pub type Mod = crate::generic::Mod<SourceRange>;
 
-pub type Located<T> = super::generic::Attributed<T, SourceRange>;
-pub type Mod = super::generic::Mod<SourceRange>;
-pub type ModModule = super::generic::ModModule<SourceRange>;
-pub type ModInteractive = super::generic::ModInteractive<SourceRange>;
-pub type ModExpression = super::generic::ModExpression<SourceRange>;
-pub type ModFunctionType = super::generic::ModFunctionType<SourceRange>;
-pub type Stmt = super::generic::Stmt<SourceRange>;
-pub type StmtKind = super::generic::StmtKind<SourceRange>;
-pub type StmtFunctionDef = super::generic::StmtFunctionDef<SourceRange>;
-pub type StmtAsyncFunctionDef = super::generic::StmtAsyncFunctionDef<SourceRange>;
-pub type StmtClassDef = super::generic::StmtClassDef<SourceRange>;
-pub type StmtReturn = super::generic::StmtReturn<SourceRange>;
-pub type StmtDelete = super::generic::StmtDelete<SourceRange>;
-pub type StmtAssign = super::generic::StmtAssign<SourceRange>;
-pub type StmtAugAssign = super::generic::StmtAugAssign<SourceRange>;
-pub type StmtAnnAssign = super::generic::StmtAnnAssign<SourceRange>;
-pub type StmtFor = super::generic::StmtFor<SourceRange>;
-pub type StmtAsyncFor = super::generic::StmtAsyncFor<SourceRange>;
-pub type StmtWhile = super::generic::StmtWhile<SourceRange>;
-pub type StmtIf = super::generic::StmtIf<SourceRange>;
-pub type StmtWith = super::generic::StmtWith<SourceRange>;
-pub type StmtAsyncWith = super::generic::StmtAsyncWith<SourceRange>;
-pub type StmtMatch = super::generic::StmtMatch<SourceRange>;
-pub type StmtRaise = super::generic::StmtRaise<SourceRange>;
-pub type StmtTry = super::generic::StmtTry<SourceRange>;
-pub type StmtTryStar = super::generic::StmtTryStar<SourceRange>;
-pub type StmtAssert = super::generic::StmtAssert<SourceRange>;
-pub type StmtImport = super::generic::StmtImport<SourceRange>;
-pub type StmtImportFrom = super::generic::StmtImportFrom<SourceRange>;
-pub type StmtGlobal = super::generic::StmtGlobal;
-pub type StmtNonlocal = super::generic::StmtNonlocal;
-pub type StmtExpr = super::generic::StmtExpr<SourceRange>;
-pub type Expr = super::generic::Expr<SourceRange>;
-pub type ExprKind = super::generic::ExprKind<SourceRange>;
-pub type ExprBoolOp = super::generic::ExprBoolOp<SourceRange>;
-pub type ExprNamedExpr = super::generic::ExprNamedExpr<SourceRange>;
-pub type ExprBinOp = super::generic::ExprBinOp<SourceRange>;
-pub type ExprUnaryOp = super::generic::ExprUnaryOp<SourceRange>;
-pub type ExprLambda = super::generic::ExprLambda<SourceRange>;
-pub type ExprIfExp = super::generic::ExprIfExp<SourceRange>;
-pub type ExprDict = super::generic::ExprDict<SourceRange>;
-pub type ExprSet = super::generic::ExprSet<SourceRange>;
-pub type ExprListComp = super::generic::ExprListComp<SourceRange>;
-pub type ExprSetComp = super::generic::ExprSetComp<SourceRange>;
-pub type ExprDictComp = super::generic::ExprDictComp<SourceRange>;
-pub type ExprGeneratorExp = super::generic::ExprGeneratorExp<SourceRange>;
-pub type ExprAwait = super::generic::ExprAwait<SourceRange>;
-pub type ExprYield = super::generic::ExprYield<SourceRange>;
-pub type ExprYieldFrom = super::generic::ExprYieldFrom<SourceRange>;
-pub type ExprCompare = super::generic::ExprCompare<SourceRange>;
-pub type ExprCall = super::generic::ExprCall<SourceRange>;
-pub type ExprFormattedValue = super::generic::ExprFormattedValue<SourceRange>;
-pub type ExprJoinedStr = super::generic::ExprJoinedStr<SourceRange>;
-pub type ExprConstant = super::generic::ExprConstant;
-pub type ExprAttribute = super::generic::ExprAttribute<SourceRange>;
-pub type ExprSubscript = super::generic::ExprSubscript<SourceRange>;
-pub type ExprStarred = super::generic::ExprStarred<SourceRange>;
-pub type ExprName = super::generic::ExprName;
-pub type ExprList = super::generic::ExprList<SourceRange>;
-pub type ExprTuple = super::generic::ExprTuple<SourceRange>;
-pub type ExprSlice = super::generic::ExprSlice<SourceRange>;
-pub type ExprContext = super::generic::ExprContext;
-pub type Boolop = super::generic::Boolop;
-pub type Operator = super::generic::Operator;
-pub type Unaryop = super::generic::Unaryop;
-pub type Cmpop = super::generic::Cmpop;
-pub type Comprehension = super::generic::Comprehension<SourceRange>;
-pub type Excepthandler = super::generic::Excepthandler<SourceRange>;
-pub type ExcepthandlerKind = super::generic::ExcepthandlerKind<SourceRange>;
-pub type ExcepthandlerExceptHandler = super::generic::ExcepthandlerExceptHandler<SourceRange>;
-pub type Arguments = super::generic::Arguments<SourceRange>;
-pub type Arg = super::generic::Arg<SourceRange>;
-pub type ArgData = super::generic::ArgData<SourceRange>;
-pub type Keyword = super::generic::Keyword<SourceRange>;
-pub type KeywordData = super::generic::KeywordData<SourceRange>;
-pub type Alias = super::generic::Alias<SourceRange>;
-pub type AliasData = super::generic::AliasData;
-pub type Withitem = super::generic::Withitem<SourceRange>;
-pub type MatchCase = super::generic::MatchCase<SourceRange>;
-pub type Pattern = super::generic::Pattern<SourceRange>;
-pub type PatternKind = super::generic::PatternKind<SourceRange>;
-pub type PatternMatchValue = super::generic::PatternMatchValue<SourceRange>;
-pub type PatternMatchSingleton = super::generic::PatternMatchSingleton;
-pub type PatternMatchSequence = super::generic::PatternMatchSequence<SourceRange>;
-pub type PatternMatchMapping = super::generic::PatternMatchMapping<SourceRange>;
-pub type PatternMatchClass = super::generic::PatternMatchClass<SourceRange>;
-pub type PatternMatchStar = super::generic::PatternMatchStar;
-pub type PatternMatchAs = super::generic::PatternMatchAs<SourceRange>;
-pub type PatternMatchOr = super::generic::PatternMatchOr<SourceRange>;
-pub type TypeIgnore = super::generic::TypeIgnore;
-pub type TypeIgnoreTypeIgnore = super::generic::TypeIgnoreTypeIgnore;
+pub type ModModule = crate::generic::ModModule<SourceRange>;
+
+#[cfg(feature = "all-nodes-with-ranges")]
+
+impl Located for ModModule {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ModInteractive = crate::generic::ModInteractive<SourceRange>;
+
+#[cfg(feature = "all-nodes-with-ranges")]
+
+impl Located for ModInteractive {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ModExpression = crate::generic::ModExpression<SourceRange>;
+
+#[cfg(feature = "all-nodes-with-ranges")]
+
+impl Located for ModExpression {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ModFunctionType = crate::generic::ModFunctionType<SourceRange>;
+
+#[cfg(feature = "all-nodes-with-ranges")]
+
+impl Located for ModFunctionType {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Located for Mod {
+    fn range(&self) -> SourceRange {
+        match self {
+            Self::Module(node) => node.range(),
+            Self::Interactive(node) => node.range(),
+            Self::Expression(node) => node.range(),
+            Self::FunctionType(node) => node.range(),
+        }
+    }
+}
+
+pub type Stmt = crate::generic::Stmt<SourceRange>;
+
+pub type StmtFunctionDef = crate::generic::StmtFunctionDef<SourceRange>;
+
+impl Located for StmtFunctionDef {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtAsyncFunctionDef = crate::generic::StmtAsyncFunctionDef<SourceRange>;
+
+impl Located for StmtAsyncFunctionDef {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtClassDef = crate::generic::StmtClassDef<SourceRange>;
+
+impl Located for StmtClassDef {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtReturn = crate::generic::StmtReturn<SourceRange>;
+
+impl Located for StmtReturn {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtDelete = crate::generic::StmtDelete<SourceRange>;
+
+impl Located for StmtDelete {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtAssign = crate::generic::StmtAssign<SourceRange>;
+
+impl Located for StmtAssign {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtAugAssign = crate::generic::StmtAugAssign<SourceRange>;
+
+impl Located for StmtAugAssign {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtAnnAssign = crate::generic::StmtAnnAssign<SourceRange>;
+
+impl Located for StmtAnnAssign {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtFor = crate::generic::StmtFor<SourceRange>;
+
+impl Located for StmtFor {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtAsyncFor = crate::generic::StmtAsyncFor<SourceRange>;
+
+impl Located for StmtAsyncFor {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtWhile = crate::generic::StmtWhile<SourceRange>;
+
+impl Located for StmtWhile {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtIf = crate::generic::StmtIf<SourceRange>;
+
+impl Located for StmtIf {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtWith = crate::generic::StmtWith<SourceRange>;
+
+impl Located for StmtWith {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtAsyncWith = crate::generic::StmtAsyncWith<SourceRange>;
+
+impl Located for StmtAsyncWith {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtMatch = crate::generic::StmtMatch<SourceRange>;
+
+impl Located for StmtMatch {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtRaise = crate::generic::StmtRaise<SourceRange>;
+
+impl Located for StmtRaise {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtTry = crate::generic::StmtTry<SourceRange>;
+
+impl Located for StmtTry {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtTryStar = crate::generic::StmtTryStar<SourceRange>;
+
+impl Located for StmtTryStar {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtAssert = crate::generic::StmtAssert<SourceRange>;
+
+impl Located for StmtAssert {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtImport = crate::generic::StmtImport<SourceRange>;
+
+impl Located for StmtImport {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtImportFrom = crate::generic::StmtImportFrom<SourceRange>;
+
+impl Located for StmtImportFrom {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtGlobal = crate::generic::StmtGlobal<SourceRange>;
+
+impl Located for StmtGlobal {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtNonlocal = crate::generic::StmtNonlocal<SourceRange>;
+
+impl Located for StmtNonlocal {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtExpr = crate::generic::StmtExpr<SourceRange>;
+
+impl Located for StmtExpr {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtPass = crate::generic::StmtPass<SourceRange>;
+
+impl Located for StmtPass {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtBreak = crate::generic::StmtBreak<SourceRange>;
+
+impl Located for StmtBreak {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type StmtContinue = crate::generic::StmtContinue<SourceRange>;
+
+impl Located for StmtContinue {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+impl Located for Stmt {
+    fn range(&self) -> SourceRange {
+        match self {
+            Self::FunctionDef(node) => node.range(),
+            Self::AsyncFunctionDef(node) => node.range(),
+            Self::ClassDef(node) => node.range(),
+            Self::Return(node) => node.range(),
+            Self::Delete(node) => node.range(),
+            Self::Assign(node) => node.range(),
+            Self::AugAssign(node) => node.range(),
+            Self::AnnAssign(node) => node.range(),
+            Self::For(node) => node.range(),
+            Self::AsyncFor(node) => node.range(),
+            Self::While(node) => node.range(),
+            Self::If(node) => node.range(),
+            Self::With(node) => node.range(),
+            Self::AsyncWith(node) => node.range(),
+            Self::Match(node) => node.range(),
+            Self::Raise(node) => node.range(),
+            Self::Try(node) => node.range(),
+            Self::TryStar(node) => node.range(),
+            Self::Assert(node) => node.range(),
+            Self::Import(node) => node.range(),
+            Self::ImportFrom(node) => node.range(),
+            Self::Global(node) => node.range(),
+            Self::Nonlocal(node) => node.range(),
+            Self::Expr(node) => node.range(),
+            Self::Pass(node) => node.range(),
+            Self::Break(node) => node.range(),
+            Self::Continue(node) => node.range(),
+        }
+    }
+}
+
+pub type Expr = crate::generic::Expr<SourceRange>;
+
+pub type ExprBoolOp = crate::generic::ExprBoolOp<SourceRange>;
+
+impl Located for ExprBoolOp {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprNamedExpr = crate::generic::ExprNamedExpr<SourceRange>;
+
+impl Located for ExprNamedExpr {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprBinOp = crate::generic::ExprBinOp<SourceRange>;
+
+impl Located for ExprBinOp {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprUnaryOp = crate::generic::ExprUnaryOp<SourceRange>;
+
+impl Located for ExprUnaryOp {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprLambda = crate::generic::ExprLambda<SourceRange>;
+
+impl Located for ExprLambda {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprIfExp = crate::generic::ExprIfExp<SourceRange>;
+
+impl Located for ExprIfExp {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprDict = crate::generic::ExprDict<SourceRange>;
+
+impl Located for ExprDict {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprSet = crate::generic::ExprSet<SourceRange>;
+
+impl Located for ExprSet {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprListComp = crate::generic::ExprListComp<SourceRange>;
+
+impl Located for ExprListComp {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprSetComp = crate::generic::ExprSetComp<SourceRange>;
+
+impl Located for ExprSetComp {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprDictComp = crate::generic::ExprDictComp<SourceRange>;
+
+impl Located for ExprDictComp {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprGeneratorExp = crate::generic::ExprGeneratorExp<SourceRange>;
+
+impl Located for ExprGeneratorExp {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprAwait = crate::generic::ExprAwait<SourceRange>;
+
+impl Located for ExprAwait {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprYield = crate::generic::ExprYield<SourceRange>;
+
+impl Located for ExprYield {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprYieldFrom = crate::generic::ExprYieldFrom<SourceRange>;
+
+impl Located for ExprYieldFrom {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprCompare = crate::generic::ExprCompare<SourceRange>;
+
+impl Located for ExprCompare {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprCall = crate::generic::ExprCall<SourceRange>;
+
+impl Located for ExprCall {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprFormattedValue = crate::generic::ExprFormattedValue<SourceRange>;
+
+impl Located for ExprFormattedValue {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprJoinedStr = crate::generic::ExprJoinedStr<SourceRange>;
+
+impl Located for ExprJoinedStr {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprConstant = crate::generic::ExprConstant<SourceRange>;
+
+impl Located for ExprConstant {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprAttribute = crate::generic::ExprAttribute<SourceRange>;
+
+impl Located for ExprAttribute {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprSubscript = crate::generic::ExprSubscript<SourceRange>;
+
+impl Located for ExprSubscript {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprStarred = crate::generic::ExprStarred<SourceRange>;
+
+impl Located for ExprStarred {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprName = crate::generic::ExprName<SourceRange>;
+
+impl Located for ExprName {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprList = crate::generic::ExprList<SourceRange>;
+
+impl Located for ExprList {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprTuple = crate::generic::ExprTuple<SourceRange>;
+
+impl Located for ExprTuple {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type ExprSlice = crate::generic::ExprSlice<SourceRange>;
+
+impl Located for ExprSlice {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+impl Located for Expr {
+    fn range(&self) -> SourceRange {
+        match self {
+            Self::BoolOp(node) => node.range(),
+            Self::NamedExpr(node) => node.range(),
+            Self::BinOp(node) => node.range(),
+            Self::UnaryOp(node) => node.range(),
+            Self::Lambda(node) => node.range(),
+            Self::IfExp(node) => node.range(),
+            Self::Dict(node) => node.range(),
+            Self::Set(node) => node.range(),
+            Self::ListComp(node) => node.range(),
+            Self::SetComp(node) => node.range(),
+            Self::DictComp(node) => node.range(),
+            Self::GeneratorExp(node) => node.range(),
+            Self::Await(node) => node.range(),
+            Self::Yield(node) => node.range(),
+            Self::YieldFrom(node) => node.range(),
+            Self::Compare(node) => node.range(),
+            Self::Call(node) => node.range(),
+            Self::FormattedValue(node) => node.range(),
+            Self::JoinedStr(node) => node.range(),
+            Self::Constant(node) => node.range(),
+            Self::Attribute(node) => node.range(),
+            Self::Subscript(node) => node.range(),
+            Self::Starred(node) => node.range(),
+            Self::Name(node) => node.range(),
+            Self::List(node) => node.range(),
+            Self::Tuple(node) => node.range(),
+            Self::Slice(node) => node.range(),
+        }
+    }
+}
+
+pub type ExprContext = crate::generic::ExprContext;
+
+pub type Boolop = crate::generic::Boolop;
+
+pub type Operator = crate::generic::Operator;
+
+pub type Unaryop = crate::generic::Unaryop;
+
+pub type Cmpop = crate::generic::Cmpop;
+
+pub type Comprehension = crate::generic::Comprehension<SourceRange>;
+
+#[cfg(feature = "all-nodes-with-ranges")]
+
+impl Located for Comprehension {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type Excepthandler = crate::generic::Excepthandler<SourceRange>;
+
+pub type ExcepthandlerExceptHandler = crate::generic::ExcepthandlerExceptHandler<SourceRange>;
+
+impl Located for ExcepthandlerExceptHandler {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+impl Located for Excepthandler {
+    fn range(&self) -> SourceRange {
+        match self {
+            Self::ExceptHandler(node) => node.range(),
+        }
+    }
+}
+
+pub type Arguments = crate::generic::Arguments<SourceRange>;
+
+#[cfg(feature = "all-nodes-with-ranges")]
+
+impl Located for Arguments {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type Arg = crate::generic::Arg<SourceRange>;
+
+impl Located for Arg {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type Keyword = crate::generic::Keyword<SourceRange>;
+
+impl Located for Keyword {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type Alias = crate::generic::Alias<SourceRange>;
+
+impl Located for Alias {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type Withitem = crate::generic::Withitem<SourceRange>;
+
+#[cfg(feature = "all-nodes-with-ranges")]
+
+impl Located for Withitem {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type MatchCase = crate::generic::MatchCase<SourceRange>;
+
+#[cfg(feature = "all-nodes-with-ranges")]
+
+impl Located for MatchCase {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type Pattern = crate::generic::Pattern<SourceRange>;
+
+pub type PatternMatchValue = crate::generic::PatternMatchValue<SourceRange>;
+
+impl Located for PatternMatchValue {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type PatternMatchSingleton = crate::generic::PatternMatchSingleton<SourceRange>;
+
+impl Located for PatternMatchSingleton {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type PatternMatchSequence = crate::generic::PatternMatchSequence<SourceRange>;
+
+impl Located for PatternMatchSequence {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type PatternMatchMapping = crate::generic::PatternMatchMapping<SourceRange>;
+
+impl Located for PatternMatchMapping {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type PatternMatchClass = crate::generic::PatternMatchClass<SourceRange>;
+
+impl Located for PatternMatchClass {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type PatternMatchStar = crate::generic::PatternMatchStar<SourceRange>;
+
+impl Located for PatternMatchStar {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type PatternMatchAs = crate::generic::PatternMatchAs<SourceRange>;
+
+impl Located for PatternMatchAs {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+pub type PatternMatchOr = crate::generic::PatternMatchOr<SourceRange>;
+
+impl Located for PatternMatchOr {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+impl Located for Pattern {
+    fn range(&self) -> SourceRange {
+        match self {
+            Self::MatchValue(node) => node.range(),
+            Self::MatchSingleton(node) => node.range(),
+            Self::MatchSequence(node) => node.range(),
+            Self::MatchMapping(node) => node.range(),
+            Self::MatchClass(node) => node.range(),
+            Self::MatchStar(node) => node.range(),
+            Self::MatchAs(node) => node.range(),
+            Self::MatchOr(node) => node.range(),
+        }
+    }
+}
+
+pub type TypeIgnore = crate::generic::TypeIgnore<SourceRange>;
+
+pub type TypeIgnoreTypeIgnore = crate::generic::TypeIgnoreTypeIgnore<SourceRange>;
+
+#[cfg(feature = "all-nodes-with-ranges")]
+
+impl Located for TypeIgnoreTypeIgnore {
+    fn range(&self) -> SourceRange {
+        self.range
+    }
+}
+
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Located for TypeIgnore {
+    fn range(&self) -> SourceRange {
+        match self {
+            Self::TypeIgnore(node) => node.range(),
+        }
+    }
+}

ast/src/gen/ranged.rs

@@ -0,0 +1,497 @@
+// File automatically generated by ast/asdl_rs.py.
+
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Ranged for crate::generic::ModModule<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Ranged for crate::generic::ModInteractive<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Ranged for crate::generic::ModExpression<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Ranged for crate::generic::ModFunctionType<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Ranged for crate::Mod {
+    fn range(&self) -> TextRange {
+        match self {
+            Self::Module(node) => node.range(),
+            Self::Interactive(node) => node.range(),
+            Self::Expression(node) => node.range(),
+            Self::FunctionType(node) => node.range(),
+        }
+    }
+}
+
+impl Ranged for crate::generic::StmtFunctionDef<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtAsyncFunctionDef<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtClassDef<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtReturn<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtDelete<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtAssign<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtAugAssign<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtAnnAssign<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtFor<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtAsyncFor<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtWhile<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtIf<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtWith<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtAsyncWith<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtMatch<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtRaise<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtTry<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtTryStar<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtAssert<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtImport<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtImportFrom<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtGlobal<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtNonlocal<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtExpr<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtPass<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtBreak<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::StmtContinue<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::Stmt {
+    fn range(&self) -> TextRange {
+        match self {
+            Self::FunctionDef(node) => node.range(),
+            Self::AsyncFunctionDef(node) => node.range(),
+            Self::ClassDef(node) => node.range(),
+            Self::Return(node) => node.range(),
+            Self::Delete(node) => node.range(),
+            Self::Assign(node) => node.range(),
+            Self::AugAssign(node) => node.range(),
+            Self::AnnAssign(node) => node.range(),
+            Self::For(node) => node.range(),
+            Self::AsyncFor(node) => node.range(),
+            Self::While(node) => node.range(),
+            Self::If(node) => node.range(),
+            Self::With(node) => node.range(),
+            Self::AsyncWith(node) => node.range(),
+            Self::Match(node) => node.range(),
+            Self::Raise(node) => node.range(),
+            Self::Try(node) => node.range(),
+            Self::TryStar(node) => node.range(),
+            Self::Assert(node) => node.range(),
+            Self::Import(node) => node.range(),
+            Self::ImportFrom(node) => node.range(),
+            Self::Global(node) => node.range(),
+            Self::Nonlocal(node) => node.range(),
+            Self::Expr(node) => node.range(),
+            Self::Pass(node) => node.range(),
+            Self::Break(node) => node.range(),
+            Self::Continue(node) => node.range(),
+        }
+    }
+}
+
+impl Ranged for crate::generic::ExprBoolOp<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprNamedExpr<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprBinOp<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprUnaryOp<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprLambda<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprIfExp<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprDict<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprSet<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprListComp<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprSetComp<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprDictComp<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprGeneratorExp<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprAwait<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprYield<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprYieldFrom<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprCompare<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprCall<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprFormattedValue<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprJoinedStr<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprConstant<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprAttribute<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprSubscript<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprStarred<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprName<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprList<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprTuple<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExprSlice<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::Expr {
+    fn range(&self) -> TextRange {
+        match self {
+            Self::BoolOp(node) => node.range(),
+            Self::NamedExpr(node) => node.range(),
+            Self::BinOp(node) => node.range(),
+            Self::UnaryOp(node) => node.range(),
+            Self::Lambda(node) => node.range(),
+            Self::IfExp(node) => node.range(),
+            Self::Dict(node) => node.range(),
+            Self::Set(node) => node.range(),
+            Self::ListComp(node) => node.range(),
+            Self::SetComp(node) => node.range(),
+            Self::DictComp(node) => node.range(),
+            Self::GeneratorExp(node) => node.range(),
+            Self::Await(node) => node.range(),
+            Self::Yield(node) => node.range(),
+            Self::YieldFrom(node) => node.range(),
+            Self::Compare(node) => node.range(),
+            Self::Call(node) => node.range(),
+            Self::FormattedValue(node) => node.range(),
+            Self::JoinedStr(node) => node.range(),
+            Self::Constant(node) => node.range(),
+            Self::Attribute(node) => node.range(),
+            Self::Subscript(node) => node.range(),
+            Self::Starred(node) => node.range(),
+            Self::Name(node) => node.range(),
+            Self::List(node) => node.range(),
+            Self::Tuple(node) => node.range(),
+            Self::Slice(node) => node.range(),
+        }
+    }
+}
+
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Ranged for crate::generic::Comprehension<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::ExcepthandlerExceptHandler<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::Excepthandler {
+    fn range(&self) -> TextRange {
+        match self {
+            Self::ExceptHandler(node) => node.range(),
+        }
+    }
+}
+
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Ranged for crate::generic::Arguments<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::Arg<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::Keyword<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::Alias<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Ranged for crate::generic::Withitem<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Ranged for crate::generic::MatchCase<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::PatternMatchValue<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::PatternMatchSingleton<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::PatternMatchSequence<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::PatternMatchMapping<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::PatternMatchClass<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::PatternMatchStar<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::PatternMatchAs<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::generic::PatternMatchOr<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+impl Ranged for crate::Pattern {
+    fn range(&self) -> TextRange {
+        match self {
+            Self::MatchValue(node) => node.range(),
+            Self::MatchSingleton(node) => node.range(),
+            Self::MatchSequence(node) => node.range(),
+            Self::MatchMapping(node) => node.range(),
+            Self::MatchClass(node) => node.range(),
+            Self::MatchStar(node) => node.range(),
+            Self::MatchAs(node) => node.range(),
+            Self::MatchOr(node) => node.range(),
+        }
+    }
+}
+
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Ranged for crate::generic::TypeIgnoreTypeIgnore<TextRange> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+#[cfg(feature = "all-nodes-with-ranges")]
+impl Ranged for crate::TypeIgnore {
+    fn range(&self) -> TextRange {
+        match self {
+            Self::TypeIgnore(node) => node.range(),
+        }
+    }
+}

ast/src/gen/visitor.rs

@@ -1,45 +1,45 @@
 // File automatically generated by ast/asdl_rs.py.
 
 #[allow(unused_variables, non_snake_case)]
-pub trait Visitor<U = ()> {
-    fn visit_stmt(&mut self, node: Stmt) {
+pub trait Visitor<R = crate::text_size::TextRange> {
+    fn visit_stmt(&mut self, node: Stmt<R>) {
         self.generic_visit_stmt(node)
     }
-    fn generic_visit_stmt(&mut self, node: Stmt) {
-        match node.node {
-            StmtKind::FunctionDef(data) => self.visit_stmt_FunctionDef(data),
-            StmtKind::AsyncFunctionDef(data) => self.visit_stmt_AsyncFunctionDef(data),
-            StmtKind::ClassDef(data) => self.visit_stmt_ClassDef(data),
-            StmtKind::Return(data) => self.visit_stmt_Return(data),
-            StmtKind::Delete(data) => self.visit_stmt_Delete(data),
-            StmtKind::Assign(data) => self.visit_stmt_Assign(data),
-            StmtKind::AugAssign(data) => self.visit_stmt_AugAssign(data),
-            StmtKind::AnnAssign(data) => self.visit_stmt_AnnAssign(data),
-            StmtKind::For(data) => self.visit_stmt_For(data),
-            StmtKind::AsyncFor(data) => self.visit_stmt_AsyncFor(data),
-            StmtKind::While(data) => self.visit_stmt_While(data),
-            StmtKind::If(data) => self.visit_stmt_If(data),
-            StmtKind::With(data) => self.visit_stmt_With(data),
-            StmtKind::AsyncWith(data) => self.visit_stmt_AsyncWith(data),
-            StmtKind::Match(data) => self.visit_stmt_Match(data),
-            StmtKind::Raise(data) => self.visit_stmt_Raise(data),
-            StmtKind::Try(data) => self.visit_stmt_Try(data),
-            StmtKind::TryStar(data) => self.visit_stmt_TryStar(data),
-            StmtKind::Assert(data) => self.visit_stmt_Assert(data),
-            StmtKind::Import(data) => self.visit_stmt_Import(data),
-            StmtKind::ImportFrom(data) => self.visit_stmt_ImportFrom(data),
-            StmtKind::Global(data) => self.visit_stmt_Global(data),
-            StmtKind::Nonlocal(data) => self.visit_stmt_Nonlocal(data),
-            StmtKind::Expr(data) => self.visit_stmt_Expr(data),
-            StmtKind::Pass => self.visit_stmt_Pass(()),
-            StmtKind::Break => self.visit_stmt_Break(()),
-            StmtKind::Continue => self.visit_stmt_Continue(()),
+    fn generic_visit_stmt(&mut self, node: Stmt<R>) {
+        match node {
+            Stmt::FunctionDef(data) => self.visit_stmt_FunctionDef(data),
+            Stmt::AsyncFunctionDef(data) => self.visit_stmt_AsyncFunctionDef(data),
+            Stmt::ClassDef(data) => self.visit_stmt_ClassDef(data),
+            Stmt::Return(data) => self.visit_stmt_Return(data),
+            Stmt::Delete(data) => self.visit_stmt_Delete(data),
+            Stmt::Assign(data) => self.visit_stmt_Assign(data),
+            Stmt::AugAssign(data) => self.visit_stmt_AugAssign(data),
+            Stmt::AnnAssign(data) => self.visit_stmt_AnnAssign(data),
+            Stmt::For(data) => self.visit_stmt_For(data),
+            Stmt::AsyncFor(data) => self.visit_stmt_AsyncFor(data),
+            Stmt::While(data) => self.visit_stmt_While(data),
+            Stmt::If(data) => self.visit_stmt_If(data),
+            Stmt::With(data) => self.visit_stmt_With(data),
+            Stmt::AsyncWith(data) => self.visit_stmt_AsyncWith(data),
+            Stmt::Match(data) => self.visit_stmt_Match(data),
+            Stmt::Raise(data) => self.visit_stmt_Raise(data),
+            Stmt::Try(data) => self.visit_stmt_Try(data),
+            Stmt::TryStar(data) => self.visit_stmt_TryStar(data),
+            Stmt::Assert(data) => self.visit_stmt_Assert(data),
+            Stmt::Import(data) => self.visit_stmt_Import(data),
+            Stmt::ImportFrom(data) => self.visit_stmt_ImportFrom(data),
+            Stmt::Global(data) => self.visit_stmt_Global(data),
+            Stmt::Nonlocal(data) => self.visit_stmt_Nonlocal(data),
+            Stmt::Expr(data) => self.visit_stmt_Expr(data),
+            Stmt::Pass(data) => self.visit_stmt_Pass(data),
+            Stmt::Break(data) => self.visit_stmt_Break(data),
+            Stmt::Continue(data) => self.visit_stmt_Continue(data),
         }
     }
-    fn visit_stmt_FunctionDef(&mut self, node: StmtFunctionDef) {
+    fn visit_stmt_FunctionDef(&mut self, node: StmtFunctionDef<R>) {
         self.generic_visit_stmt_FunctionDef(node)
     }
-    fn generic_visit_stmt_FunctionDef(&mut self, node: StmtFunctionDef) {
+    fn generic_visit_stmt_FunctionDef(&mut self, node: StmtFunctionDef<R>) {
         {
             let value = node.args;
             self.visit_arguments(*value);
@@ -54,10 +54,10 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_stmt_AsyncFunctionDef(&mut self, node: StmtAsyncFunctionDef) {
+    fn visit_stmt_AsyncFunctionDef(&mut self, node: StmtAsyncFunctionDef<R>) {
         self.generic_visit_stmt_AsyncFunctionDef(node)
     }
-    fn generic_visit_stmt_AsyncFunctionDef(&mut self, node: StmtAsyncFunctionDef) {
+    fn generic_visit_stmt_AsyncFunctionDef(&mut self, node: StmtAsyncFunctionDef<R>) {
         {
             let value = node.args;
             self.visit_arguments(*value);
@@ -72,10 +72,10 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_stmt_ClassDef(&mut self, node: StmtClassDef) {
+    fn visit_stmt_ClassDef(&mut self, node: StmtClassDef<R>) {
         self.generic_visit_stmt_ClassDef(node)
     }
-    fn generic_visit_stmt_ClassDef(&mut self, node: StmtClassDef) {
+    fn generic_visit_stmt_ClassDef(&mut self, node: StmtClassDef<R>) {
         for value in node.bases {
             self.visit_expr(value);
         }
@@ -89,26 +89,26 @@ pub trait Visitor<U = ()> {
             self.visit_expr(value);
         }
     }
-    fn visit_stmt_Return(&mut self, node: StmtReturn) {
+    fn visit_stmt_Return(&mut self, node: StmtReturn<R>) {
         self.generic_visit_stmt_Return(node)
     }
-    fn generic_visit_stmt_Return(&mut self, node: StmtReturn) {
+    fn generic_visit_stmt_Return(&mut self, node: StmtReturn<R>) {
         if let Some(value) = node.value {
             self.visit_expr(*value);
         }
     }
-    fn visit_stmt_Delete(&mut self, node: StmtDelete) {
+    fn visit_stmt_Delete(&mut self, node: StmtDelete<R>) {
         self.generic_visit_stmt_Delete(node)
     }
-    fn generic_visit_stmt_Delete(&mut self, node: StmtDelete) {
+    fn generic_visit_stmt_Delete(&mut self, node: StmtDelete<R>) {
         for value in node.targets {
             self.visit_expr(value);
         }
     }
-    fn visit_stmt_Assign(&mut self, node: StmtAssign) {
+    fn visit_stmt_Assign(&mut self, node: StmtAssign<R>) {
         self.generic_visit_stmt_Assign(node)
     }
-    fn generic_visit_stmt_Assign(&mut self, node: StmtAssign) {
+    fn generic_visit_stmt_Assign(&mut self, node: StmtAssign<R>) {
         for value in node.targets {
             self.visit_expr(value);
         }
@@ -117,10 +117,10 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_stmt_AugAssign(&mut self, node: StmtAugAssign) {
+    fn visit_stmt_AugAssign(&mut self, node: StmtAugAssign<R>) {
         self.generic_visit_stmt_AugAssign(node)
     }
-    fn generic_visit_stmt_AugAssign(&mut self, node: StmtAugAssign) {
+    fn generic_visit_stmt_AugAssign(&mut self, node: StmtAugAssign<R>) {
         {
             let value = node.target;
             self.visit_expr(*value);
@@ -130,10 +130,10 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_stmt_AnnAssign(&mut self, node: StmtAnnAssign) {
+    fn visit_stmt_AnnAssign(&mut self, node: StmtAnnAssign<R>) {
         self.generic_visit_stmt_AnnAssign(node)
     }
-    fn generic_visit_stmt_AnnAssign(&mut self, node: StmtAnnAssign) {
+    fn generic_visit_stmt_AnnAssign(&mut self, node: StmtAnnAssign<R>) {
         {
             let value = node.target;
             self.visit_expr(*value);
@@ -146,10 +146,10 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_stmt_For(&mut self, node: StmtFor) {
+    fn visit_stmt_For(&mut self, node: StmtFor<R>) {
         self.generic_visit_stmt_For(node)
     }
-    fn generic_visit_stmt_For(&mut self, node: StmtFor) {
+    fn generic_visit_stmt_For(&mut self, node: StmtFor<R>) {
         {
             let value = node.target;
             self.visit_expr(*value);
@@ -165,10 +165,10 @@ pub trait Visitor<U = ()> {
             self.visit_stmt(value);
         }
     }
-    fn visit_stmt_AsyncFor(&mut self, node: StmtAsyncFor) {
+    fn visit_stmt_AsyncFor(&mut self, node: StmtAsyncFor<R>) {
         self.generic_visit_stmt_AsyncFor(node)
     }
-    fn generic_visit_stmt_AsyncFor(&mut self, node: StmtAsyncFor) {
+    fn generic_visit_stmt_AsyncFor(&mut self, node: StmtAsyncFor<R>) {
         {
             let value = node.target;
             self.visit_expr(*value);
@@ -184,10 +184,10 @@ pub trait Visitor<U = ()> {
             self.visit_stmt(value);
         }
     }
-    fn visit_stmt_While(&mut self, node: StmtWhile) {
+    fn visit_stmt_While(&mut self, node: StmtWhile<R>) {
         self.generic_visit_stmt_While(node)
     }
-    fn generic_visit_stmt_While(&mut self, node: StmtWhile) {
+    fn generic_visit_stmt_While(&mut self, node: StmtWhile<R>) {
         {
             let value = node.test;
             self.visit_expr(*value);
@@ -199,10 +199,10 @@ pub trait Visitor<U = ()> {
             self.visit_stmt(value);
         }
     }
-    fn visit_stmt_If(&mut self, node: StmtIf) {
+    fn visit_stmt_If(&mut self, node: StmtIf<R>) {
         self.generic_visit_stmt_If(node)
     }
-    fn generic_visit_stmt_If(&mut self, node: StmtIf) {
+    fn generic_visit_stmt_If(&mut self, node: StmtIf<R>) {
         {
             let value = node.test;
             self.visit_expr(*value);
@@ -214,10 +214,10 @@ pub trait Visitor<U = ()> {
             self.visit_stmt(value);
         }
     }
-    fn visit_stmt_With(&mut self, node: StmtWith) {
+    fn visit_stmt_With(&mut self, node: StmtWith<R>) {
         self.generic_visit_stmt_With(node)
     }
-    fn generic_visit_stmt_With(&mut self, node: StmtWith) {
+    fn generic_visit_stmt_With(&mut self, node: StmtWith<R>) {
         for value in node.items {
             self.visit_withitem(value);
         }
@@ -225,10 +225,10 @@ pub trait Visitor<U = ()> {
             self.visit_stmt(value);
         }
     }
-    fn visit_stmt_AsyncWith(&mut self, node: StmtAsyncWith) {
+    fn visit_stmt_AsyncWith(&mut self, node: StmtAsyncWith<R>) {
         self.generic_visit_stmt_AsyncWith(node)
     }
-    fn generic_visit_stmt_AsyncWith(&mut self, node: StmtAsyncWith) {
+    fn generic_visit_stmt_AsyncWith(&mut self, node: StmtAsyncWith<R>) {
         for value in node.items {
             self.visit_withitem(value);
         }
@@ -236,10 +236,10 @@ pub trait Visitor<U = ()> {
             self.visit_stmt(value);
         }
     }
-    fn visit_stmt_Match(&mut self, node: StmtMatch) {
+    fn visit_stmt_Match(&mut self, node: StmtMatch<R>) {
         self.generic_visit_stmt_Match(node)
     }
-    fn generic_visit_stmt_Match(&mut self, node: StmtMatch) {
+    fn generic_visit_stmt_Match(&mut self, node: StmtMatch<R>) {
         {
             let value = node.subject;
             self.visit_expr(*value);
@@ -248,10 +248,10 @@ pub trait Visitor<U = ()> {
             self.visit_match_case(value);
         }
     }
-    fn visit_stmt_Raise(&mut self, node: StmtRaise) {
+    fn visit_stmt_Raise(&mut self, node: StmtRaise<R>) {
         self.generic_visit_stmt_Raise(node)
     }
-    fn generic_visit_stmt_Raise(&mut self, node: StmtRaise) {
+    fn generic_visit_stmt_Raise(&mut self, node: StmtRaise<R>) {
         if let Some(value) = node.exc {
             self.visit_expr(*value);
         }
@@ -259,10 +259,10 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_stmt_Try(&mut self, node: StmtTry) {
+    fn visit_stmt_Try(&mut self, node: StmtTry<R>) {
         self.generic_visit_stmt_Try(node)
     }
-    fn generic_visit_stmt_Try(&mut self, node: StmtTry) {
+    fn generic_visit_stmt_Try(&mut self, node: StmtTry<R>) {
         for value in node.body {
             self.visit_stmt(value);
         }
@@ -276,10 +276,10 @@ pub trait Visitor<U = ()> {
             self.visit_stmt(value);
         }
     }
-    fn visit_stmt_TryStar(&mut self, node: StmtTryStar) {
+    fn visit_stmt_TryStar(&mut self, node: StmtTryStar<R>) {
         self.generic_visit_stmt_TryStar(node)
     }
-    fn generic_visit_stmt_TryStar(&mut self, node: StmtTryStar) {
+    fn generic_visit_stmt_TryStar(&mut self, node: StmtTryStar<R>) {
         for value in node.body {
             self.visit_stmt(value);
         }
@@ -293,10 +293,10 @@ pub trait Visitor<U = ()> {
             self.visit_stmt(value);
         }
     }
-    fn visit_stmt_Assert(&mut self, node: StmtAssert) {
+    fn visit_stmt_Assert(&mut self, node: StmtAssert<R>) {
         self.generic_visit_stmt_Assert(node)
     }
-    fn generic_visit_stmt_Assert(&mut self, node: StmtAssert) {
+    fn generic_visit_stmt_Assert(&mut self, node: StmtAssert<R>) {
         {
             let value = node.test;
             self.visit_expr(*value);
@@ -305,97 +305,88 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_stmt_Import(&mut self, node: StmtImport) {
+    fn visit_stmt_Import(&mut self, node: StmtImport<R>) {
         self.generic_visit_stmt_Import(node)
     }
-    fn generic_visit_stmt_Import(&mut self, node: StmtImport) {
+    fn generic_visit_stmt_Import(&mut self, node: StmtImport<R>) {
         for value in node.names {
             self.visit_alias(value);
         }
     }
-    fn visit_stmt_ImportFrom(&mut self, node: StmtImportFrom) {
+    fn visit_stmt_ImportFrom(&mut self, node: StmtImportFrom<R>) {
         self.generic_visit_stmt_ImportFrom(node)
     }
-    fn generic_visit_stmt_ImportFrom(&mut self, node: StmtImportFrom) {
+    fn generic_visit_stmt_ImportFrom(&mut self, node: StmtImportFrom<R>) {
         for value in node.names {
             self.visit_alias(value);
         }
     }
-    fn visit_stmt_Global(&mut self, node: StmtGlobal) {
+    fn visit_stmt_Global(&mut self, node: StmtGlobal<R>) {
         self.generic_visit_stmt_Global(node)
     }
-    fn generic_visit_stmt_Global(&mut self, node: StmtGlobal) {}
-    fn visit_stmt_Nonlocal(&mut self, node: StmtNonlocal) {
+    fn generic_visit_stmt_Global(&mut self, node: StmtGlobal<R>) {}
+    fn visit_stmt_Nonlocal(&mut self, node: StmtNonlocal<R>) {
         self.generic_visit_stmt_Nonlocal(node)
     }
-    fn generic_visit_stmt_Nonlocal(&mut self, node: StmtNonlocal) {}
-    fn visit_stmt_Expr(&mut self, node: StmtExpr) {
+    fn generic_visit_stmt_Nonlocal(&mut self, node: StmtNonlocal<R>) {}
+    fn visit_stmt_Expr(&mut self, node: StmtExpr<R>) {
         self.generic_visit_stmt_Expr(node)
     }
-    fn generic_visit_stmt_Expr(&mut self, node: StmtExpr) {
+    fn generic_visit_stmt_Expr(&mut self, node: StmtExpr<R>) {
         {
             let value = node.value;
             self.visit_expr(*value);
         }
     }
-    fn visit_stmt_Pass(&mut self, node: ()) {
-        self.generic_visit_stmt_Pass(())
-    }
-    fn generic_visit_stmt_Pass(&mut self, node: ()) {}
-    fn visit_stmt_Break(&mut self, node: ()) {
-        self.generic_visit_stmt_Break(())
-    }
-    fn generic_visit_stmt_Break(&mut self, node: ()) {}
-    fn visit_stmt_Continue(&mut self, node: ()) {
-        self.generic_visit_stmt_Continue(())
-    }
-    fn generic_visit_stmt_Continue(&mut self, node: ()) {}
-    fn visit_expr(&mut self, node: Expr) {
+    fn visit_stmt_Pass(&mut self, node: StmtPass<R>) {}
+    fn visit_stmt_Break(&mut self, node: StmtBreak<R>) {}
+    fn visit_stmt_Continue(&mut self, node: StmtContinue<R>) {}
+    fn visit_expr(&mut self, node: Expr<R>) {
         self.generic_visit_expr(node)
     }
-    fn generic_visit_expr(&mut self, node: Expr) {
-        match node.node {
-            ExprKind::BoolOp(data) => self.visit_expr_BoolOp(data),
-            ExprKind::NamedExpr(data) => self.visit_expr_NamedExpr(data),
-            ExprKind::BinOp(data) => self.visit_expr_BinOp(data),
-            ExprKind::UnaryOp(data) => self.visit_expr_UnaryOp(data),
-            ExprKind::Lambda(data) => self.visit_expr_Lambda(data),
-            ExprKind::IfExp(data) => self.visit_expr_IfExp(data),
-            ExprKind::Dict(data) => self.visit_expr_Dict(data),
-            ExprKind::Set(data) => self.visit_expr_Set(data),
-            ExprKind::ListComp(data) => self.visit_expr_ListComp(data),
-            ExprKind::SetComp(data) => self.visit_expr_SetComp(data),
-            ExprKind::DictComp(data) => self.visit_expr_DictComp(data),
-            ExprKind::GeneratorExp(data) => self.visit_expr_GeneratorExp(data),
-            ExprKind::Await(data) => self.visit_expr_Await(data),
-            ExprKind::Yield(data) => self.visit_expr_Yield(data),
-            ExprKind::YieldFrom(data) => self.visit_expr_YieldFrom(data),
-            ExprKind::Compare(data) => self.visit_expr_Compare(data),
-            ExprKind::Call(data) => self.visit_expr_Call(data),
-            ExprKind::FormattedValue(data) => self.visit_expr_FormattedValue(data),
-            ExprKind::JoinedStr(data) => self.visit_expr_JoinedStr(data),
-            ExprKind::Constant(data) => self.visit_expr_Constant(data),
-            ExprKind::Attribute(data) => self.visit_expr_Attribute(data),
-            ExprKind::Subscript(data) => self.visit_expr_Subscript(data),
-            ExprKind::Starred(data) => self.visit_expr_Starred(data),
-            ExprKind::Name(data) => self.visit_expr_Name(data),
-            ExprKind::List(data) => self.visit_expr_List(data),
-            ExprKind::Tuple(data) => self.visit_expr_Tuple(data),
-            ExprKind::Slice(data) => self.visit_expr_Slice(data),
+    fn generic_visit_expr(&mut self, node: Expr<R>) {
+        match node {
+            Expr::BoolOp(data) => self.visit_expr_BoolOp(data),
+            Expr::NamedExpr(data) => self.visit_expr_NamedExpr(data),
+            Expr::BinOp(data) => self.visit_expr_BinOp(data),
+            Expr::UnaryOp(data) => self.visit_expr_UnaryOp(data),
+            Expr::Lambda(data) => self.visit_expr_Lambda(data),
+            Expr::IfExp(data) => self.visit_expr_IfExp(data),
+            Expr::Dict(data) => self.visit_expr_Dict(data),
+            Expr::Set(data) => self.visit_expr_Set(data),
+            Expr::ListComp(data) => self.visit_expr_ListComp(data),
+            Expr::SetComp(data) => self.visit_expr_SetComp(data),
+            Expr::DictComp(data) => self.visit_expr_DictComp(data),
+            Expr::GeneratorExp(data) => self.visit_expr_GeneratorExp(data),
+            Expr::Await(data) => self.visit_expr_Await(data),
+            Expr::Yield(data) => self.visit_expr_Yield(data),
+            Expr::YieldFrom(data) => self.visit_expr_YieldFrom(data),
+            Expr::Compare(data) => self.visit_expr_Compare(data),
+            Expr::Call(data) => self.visit_expr_Call(data),
+            Expr::FormattedValue(data) => self.visit_expr_FormattedValue(data),
+            Expr::JoinedStr(data) => self.visit_expr_JoinedStr(data),
+            Expr::Constant(data) => self.visit_expr_Constant(data),
+            Expr::Attribute(data) => self.visit_expr_Attribute(data),
+            Expr::Subscript(data) => self.visit_expr_Subscript(data),
+            Expr::Starred(data) => self.visit_expr_Starred(data),
+            Expr::Name(data) => self.visit_expr_Name(data),
+            Expr::List(data) => self.visit_expr_List(data),
+            Expr::Tuple(data) => self.visit_expr_Tuple(data),
+            Expr::Slice(data) => self.visit_expr_Slice(data),
         }
     }
-    fn visit_expr_BoolOp(&mut self, node: ExprBoolOp) {
+    fn visit_expr_BoolOp(&mut self, node: ExprBoolOp<R>) {
         self.generic_visit_expr_BoolOp(node)
     }
-    fn generic_visit_expr_BoolOp(&mut self, node: ExprBoolOp) {
+    fn generic_visit_expr_BoolOp(&mut self, node: ExprBoolOp<R>) {
         for value in node.values {
             self.visit_expr(value);
         }
     }
-    fn visit_expr_NamedExpr(&mut self, node: ExprNamedExpr) {
+    fn visit_expr_NamedExpr(&mut self, node: ExprNamedExpr<R>) {
         self.generic_visit_expr_NamedExpr(node)
     }
-    fn generic_visit_expr_NamedExpr(&mut self, node: ExprNamedExpr) {
+    fn generic_visit_expr_NamedExpr(&mut self, node: ExprNamedExpr<R>) {
         {
             let value = node.target;
             self.visit_expr(*value);
@@ -405,10 +396,10 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_BinOp(&mut self, node: ExprBinOp) {
+    fn visit_expr_BinOp(&mut self, node: ExprBinOp<R>) {
         self.generic_visit_expr_BinOp(node)
     }
-    fn generic_visit_expr_BinOp(&mut self, node: ExprBinOp) {
+    fn generic_visit_expr_BinOp(&mut self, node: ExprBinOp<R>) {
         {
             let value = node.left;
             self.visit_expr(*value);
@@ -418,19 +409,19 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_UnaryOp(&mut self, node: ExprUnaryOp) {
+    fn visit_expr_UnaryOp(&mut self, node: ExprUnaryOp<R>) {
         self.generic_visit_expr_UnaryOp(node)
     }
-    fn generic_visit_expr_UnaryOp(&mut self, node: ExprUnaryOp) {
+    fn generic_visit_expr_UnaryOp(&mut self, node: ExprUnaryOp<R>) {
         {
             let value = node.operand;
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_Lambda(&mut self, node: ExprLambda) {
+    fn visit_expr_Lambda(&mut self, node: ExprLambda<R>) {
         self.generic_visit_expr_Lambda(node)
     }
-    fn generic_visit_expr_Lambda(&mut self, node: ExprLambda) {
+    fn generic_visit_expr_Lambda(&mut self, node: ExprLambda<R>) {
         {
             let value = node.args;
             self.visit_arguments(*value);
@@ -440,10 +431,10 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_IfExp(&mut self, node: ExprIfExp) {
+    fn visit_expr_IfExp(&mut self, node: ExprIfExp<R>) {
         self.generic_visit_expr_IfExp(node)
     }
-    fn generic_visit_expr_IfExp(&mut self, node: ExprIfExp) {
+    fn generic_visit_expr_IfExp(&mut self, node: ExprIfExp<R>) {
         {
             let value = node.test;
             self.visit_expr(*value);
@@ -457,10 +448,10 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_Dict(&mut self, node: ExprDict) {
+    fn visit_expr_Dict(&mut self, node: ExprDict<R>) {
         self.generic_visit_expr_Dict(node)
     }
-    fn generic_visit_expr_Dict(&mut self, node: ExprDict) {
+    fn generic_visit_expr_Dict(&mut self, node: ExprDict<R>) {
         for value in node.keys.into_iter().flatten() {
             self.visit_expr(value);
         }
@@ -468,18 +459,18 @@ pub trait Visitor<U = ()> {
             self.visit_expr(value);
         }
     }
-    fn visit_expr_Set(&mut self, node: ExprSet) {
+    fn visit_expr_Set(&mut self, node: ExprSet<R>) {
         self.generic_visit_expr_Set(node)
     }
-    fn generic_visit_expr_Set(&mut self, node: ExprSet) {
+    fn generic_visit_expr_Set(&mut self, node: ExprSet<R>) {
         for value in node.elts {
             self.visit_expr(value);
         }
     }
-    fn visit_expr_ListComp(&mut self, node: ExprListComp) {
+    fn visit_expr_ListComp(&mut self, node: ExprListComp<R>) {
         self.generic_visit_expr_ListComp(node)
     }
-    fn generic_visit_expr_ListComp(&mut self, node: ExprListComp) {
+    fn generic_visit_expr_ListComp(&mut self, node: ExprListComp<R>) {
         {
             let value = node.elt;
             self.visit_expr(*value);
@@ -488,10 +479,10 @@ pub trait Visitor<U = ()> {
             self.visit_comprehension(value);
         }
     }
-    fn visit_expr_SetComp(&mut self, node: ExprSetComp) {
+    fn visit_expr_SetComp(&mut self, node: ExprSetComp<R>) {
         self.generic_visit_expr_SetComp(node)
     }
-    fn generic_visit_expr_SetComp(&mut self, node: ExprSetComp) {
+    fn generic_visit_expr_SetComp(&mut self, node: ExprSetComp<R>) {
         {
             let value = node.elt;
             self.visit_expr(*value);
@@ -500,10 +491,10 @@ pub trait Visitor<U = ()> {
             self.visit_comprehension(value);
         }
     }
-    fn visit_expr_DictComp(&mut self, node: ExprDictComp) {
+    fn visit_expr_DictComp(&mut self, node: ExprDictComp<R>) {
         self.generic_visit_expr_DictComp(node)
     }
-    fn generic_visit_expr_DictComp(&mut self, node: ExprDictComp) {
+    fn generic_visit_expr_DictComp(&mut self, node: ExprDictComp<R>) {
         {
             let value = node.key;
             self.visit_expr(*value);
@@ -516,10 +507,10 @@ pub trait Visitor<U = ()> {
             self.visit_comprehension(value);
         }
     }
-    fn visit_expr_GeneratorExp(&mut self, node: ExprGeneratorExp) {
+    fn visit_expr_GeneratorExp(&mut self, node: ExprGeneratorExp<R>) {
         self.generic_visit_expr_GeneratorExp(node)
     }
-    fn generic_visit_expr_GeneratorExp(&mut self, node: ExprGeneratorExp) {
+    fn generic_visit_expr_GeneratorExp(&mut self, node: ExprGeneratorExp<R>) {
         {
             let value = node.elt;
             self.visit_expr(*value);
@@ -528,36 +519,36 @@ pub trait Visitor<U = ()> {
             self.visit_comprehension(value);
         }
     }
-    fn visit_expr_Await(&mut self, node: ExprAwait) {
+    fn visit_expr_Await(&mut self, node: ExprAwait<R>) {
         self.generic_visit_expr_Await(node)
     }
-    fn generic_visit_expr_Await(&mut self, node: ExprAwait) {
+    fn generic_visit_expr_Await(&mut self, node: ExprAwait<R>) {
         {
             let value = node.value;
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_Yield(&mut self, node: ExprYield) {
+    fn visit_expr_Yield(&mut self, node: ExprYield<R>) {
         self.generic_visit_expr_Yield(node)
     }
-    fn generic_visit_expr_Yield(&mut self, node: ExprYield) {
+    fn generic_visit_expr_Yield(&mut self, node: ExprYield<R>) {
         if let Some(value) = node.value {
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_YieldFrom(&mut self, node: ExprYieldFrom) {
+    fn visit_expr_YieldFrom(&mut self, node: ExprYieldFrom<R>) {
         self.generic_visit_expr_YieldFrom(node)
     }
-    fn generic_visit_expr_YieldFrom(&mut self, node: ExprYieldFrom) {
+    fn generic_visit_expr_YieldFrom(&mut self, node: ExprYieldFrom<R>) {
         {
             let value = node.value;
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_Compare(&mut self, node: ExprCompare) {
+    fn visit_expr_Compare(&mut self, node: ExprCompare<R>) {
         self.generic_visit_expr_Compare(node)
     }
-    fn generic_visit_expr_Compare(&mut self, node: ExprCompare) {
+    fn generic_visit_expr_Compare(&mut self, node: ExprCompare<R>) {
         {
             let value = node.left;
             self.visit_expr(*value);
@@ -566,10 +557,10 @@ pub trait Visitor<U = ()> {
             self.visit_expr(value);
         }
     }
-    fn visit_expr_Call(&mut self, node: ExprCall) {
+    fn visit_expr_Call(&mut self, node: ExprCall<R>) {
         self.generic_visit_expr_Call(node)
     }
-    fn generic_visit_expr_Call(&mut self, node: ExprCall) {
+    fn generic_visit_expr_Call(&mut self, node: ExprCall<R>) {
         {
             let value = node.func;
             self.visit_expr(*value);
@@ -581,10 +572,10 @@ pub trait Visitor<U = ()> {
             self.visit_keyword(value);
         }
     }
-    fn visit_expr_FormattedValue(&mut self, node: ExprFormattedValue) {
+    fn visit_expr_FormattedValue(&mut self, node: ExprFormattedValue<R>) {
         self.generic_visit_expr_FormattedValue(node)
     }
-    fn generic_visit_expr_FormattedValue(&mut self, node: ExprFormattedValue) {
+    fn generic_visit_expr_FormattedValue(&mut self, node: ExprFormattedValue<R>) {
         {
             let value = node.value;
             self.visit_expr(*value);
@@ -593,31 +584,31 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_JoinedStr(&mut self, node: ExprJoinedStr) {
+    fn visit_expr_JoinedStr(&mut self, node: ExprJoinedStr<R>) {
         self.generic_visit_expr_JoinedStr(node)
     }
-    fn generic_visit_expr_JoinedStr(&mut self, node: ExprJoinedStr) {
+    fn generic_visit_expr_JoinedStr(&mut self, node: ExprJoinedStr<R>) {
         for value in node.values {
             self.visit_expr(value);
         }
     }
-    fn visit_expr_Constant(&mut self, node: ExprConstant) {
+    fn visit_expr_Constant(&mut self, node: ExprConstant<R>) {
         self.generic_visit_expr_Constant(node)
     }
-    fn generic_visit_expr_Constant(&mut self, node: ExprConstant) {}
-    fn visit_expr_Attribute(&mut self, node: ExprAttribute) {
+    fn generic_visit_expr_Constant(&mut self, node: ExprConstant<R>) {}
+    fn visit_expr_Attribute(&mut self, node: ExprAttribute<R>) {
         self.generic_visit_expr_Attribute(node)
     }
-    fn generic_visit_expr_Attribute(&mut self, node: ExprAttribute) {
+    fn generic_visit_expr_Attribute(&mut self, node: ExprAttribute<R>) {
         {
             let value = node.value;
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_Subscript(&mut self, node: ExprSubscript) {
+    fn visit_expr_Subscript(&mut self, node: ExprSubscript<R>) {
         self.generic_visit_expr_Subscript(node)
     }
-    fn generic_visit_expr_Subscript(&mut self, node: ExprSubscript) {
+    fn generic_visit_expr_Subscript(&mut self, node: ExprSubscript<R>) {
         {
             let value = node.value;
             self.visit_expr(*value);
@@ -627,39 +618,39 @@ pub trait Visitor<U = ()> {
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_Starred(&mut self, node: ExprStarred) {
+    fn visit_expr_Starred(&mut self, node: ExprStarred<R>) {
         self.generic_visit_expr_Starred(node)
     }
-    fn generic_visit_expr_Starred(&mut self, node: ExprStarred) {
+    fn generic_visit_expr_Starred(&mut self, node: ExprStarred<R>) {
         {
             let value = node.value;
             self.visit_expr(*value);
         }
     }
-    fn visit_expr_Name(&mut self, node: ExprName) {
+    fn visit_expr_Name(&mut self, node: ExprName<R>) {
         self.generic_visit_expr_Name(node)
     }
-    fn generic_visit_expr_Name(&mut self, node: ExprName) {}
-    fn visit_expr_List(&mut self, node: ExprList) {
+    fn generic_visit_expr_Name(&mut self, node: ExprName<R>) {}
+    fn visit_expr_List(&mut self, node: ExprList<R>) {
         self.generic_visit_expr_List(node)
     }
-    fn generic_visit_expr_List(&mut self, node: ExprList) {
+    fn generic_visit_expr_List(&mut self, node: ExprList<R>) {
         for value in node.elts {
             self.visit_expr(value);
         }
     }
-    fn visit_expr_Tuple(&mut self, node: ExprTuple) {
+    fn visit_expr_Tuple(&mut self, node: ExprTuple<R>) {
         self.generic_visit_expr_Tuple(node)
     }
-    fn generic_visit_expr_Tuple(&mut self, node: ExprTuple) {
+    fn generic_visit_expr_Tuple(&mut self, node: ExprTuple<R>) {
         for value in node.elts {
             self.visit_expr(value);
         }
     }
-    fn visit_expr_Slice(&mut self, node: ExprSlice) {
+    fn visit_expr_Slice(&mut self, node: ExprSlice<R>) {
         self.generic_visit_expr_Slice(node)
     }
-    fn generic_visit_expr_Slice(&mut self, node: ExprSlice) {
+    fn generic_visit_expr_Slice(&mut self, node: ExprSlice<R>) {
         if let Some(value) = node.lower {
             self.visit_expr(*value);
         }
@@ -690,22 +681,22 @@ pub trait Visitor<U = ()> {
         self.generic_visit_cmpop(node)
     }
     fn generic_visit_cmpop(&mut self, node: Cmpop) {}
-    fn visit_comprehension(&mut self, node: Comprehension) {
+    fn visit_comprehension(&mut self, node: Comprehension<R>) {
         self.generic_visit_comprehension(node)
     }
-    fn generic_visit_comprehension(&mut self, node: Comprehension) {}
-    fn visit_excepthandler(&mut self, node: Excepthandler) {
+    fn generic_visit_comprehension(&mut self, node: Comprehension<R>) {}
+    fn visit_excepthandler(&mut self, node: Excepthandler<R>) {
         self.generic_visit_excepthandler(node)
     }
-    fn generic_visit_excepthandler(&mut self, node: Excepthandler) {
-        match node.node {
-            ExcepthandlerKind::ExceptHandler(data) => self.visit_excepthandler_ExceptHandler(data),
+    fn generic_visit_excepthandler(&mut self, node: Excepthandler<R>) {
+        match node {
+            Excepthandler::ExceptHandler(data) => self.visit_excepthandler_ExceptHandler(data),
         }
     }
-    fn visit_excepthandler_ExceptHandler(&mut self, node: ExcepthandlerExceptHandler) {
+    fn visit_excepthandler_ExceptHandler(&mut self, node: ExcepthandlerExceptHandler<R>) {
         self.generic_visit_excepthandler_ExceptHandler(node)
     }
-    fn generic_visit_excepthandler_ExceptHandler(&mut self, node: ExcepthandlerExceptHandler) {
+    fn generic_visit_excepthandler_ExceptHandler(&mut self, node: ExcepthandlerExceptHandler<R>) {
         if let Some(value) = node.type_ {
             self.visit_expr(*value);
         }
@@ -713,70 +704,70 @@ pub trait Visitor<U = ()> {
             self.visit_stmt(value);
         }
     }
-    fn visit_arguments(&mut self, node: Arguments) {
+    fn visit_arguments(&mut self, node: Arguments<R>) {
         self.generic_visit_arguments(node)
     }
-    fn generic_visit_arguments(&mut self, node: Arguments) {}
-    fn visit_arg(&mut self, node: Arg) {
+    fn generic_visit_arguments(&mut self, node: Arguments<R>) {}
+    fn visit_arg(&mut self, node: Arg<R>) {
         self.generic_visit_arg(node)
     }
-    fn generic_visit_arg(&mut self, node: Arg) {}
-    fn visit_keyword(&mut self, node: Keyword) {
+    fn generic_visit_arg(&mut self, node: Arg<R>) {}
+    fn visit_keyword(&mut self, node: Keyword<R>) {
         self.generic_visit_keyword(node)
     }
-    fn generic_visit_keyword(&mut self, node: Keyword) {}
-    fn visit_alias(&mut self, node: Alias) {
+    fn generic_visit_keyword(&mut self, node: Keyword<R>) {}
+    fn visit_alias(&mut self, node: Alias<R>) {
         self.generic_visit_alias(node)
     }
-    fn generic_visit_alias(&mut self, node: Alias) {}
-    fn visit_withitem(&mut self, node: Withitem) {
+    fn generic_visit_alias(&mut self, node: Alias<R>) {}
+    fn visit_withitem(&mut self, node: Withitem<R>) {
         self.generic_visit_withitem(node)
     }
-    fn generic_visit_withitem(&mut self, node: Withitem) {}
-    fn visit_match_case(&mut self, node: MatchCase) {
+    fn generic_visit_withitem(&mut self, node: Withitem<R>) {}
+    fn visit_match_case(&mut self, node: MatchCase<R>) {
         self.generic_visit_match_case(node)
     }
-    fn generic_visit_match_case(&mut self, node: MatchCase) {}
-    fn visit_pattern(&mut self, node: Pattern) {
+    fn generic_visit_match_case(&mut self, node: MatchCase<R>) {}
+    fn visit_pattern(&mut self, node: Pattern<R>) {
         self.generic_visit_pattern(node)
     }
-    fn generic_visit_pattern(&mut self, node: Pattern) {
-        match node.node {
-            PatternKind::MatchValue(data) => self.visit_pattern_MatchValue(data),
-            PatternKind::MatchSingleton(data) => self.visit_pattern_MatchSingleton(data),
-            PatternKind::MatchSequence(data) => self.visit_pattern_MatchSequence(data),
-            PatternKind::MatchMapping(data) => self.visit_pattern_MatchMapping(data),
-            PatternKind::MatchClass(data) => self.visit_pattern_MatchClass(data),
-            PatternKind::MatchStar(data) => self.visit_pattern_MatchStar(data),
-            PatternKind::MatchAs(data) => self.visit_pattern_MatchAs(data),
-            PatternKind::MatchOr(data) => self.visit_pattern_MatchOr(data),
+    fn generic_visit_pattern(&mut self, node: Pattern<R>) {
+        match node {
+            Pattern::MatchValue(data) => self.visit_pattern_MatchValue(data),
+            Pattern::MatchSingleton(data) => self.visit_pattern_MatchSingleton(data),
+            Pattern::MatchSequence(data) => self.visit_pattern_MatchSequence(data),
+            Pattern::MatchMapping(data) => self.visit_pattern_MatchMapping(data),
+            Pattern::MatchClass(data) => self.visit_pattern_MatchClass(data),
+            Pattern::MatchStar(data) => self.visit_pattern_MatchStar(data),
+            Pattern::MatchAs(data) => self.visit_pattern_MatchAs(data),
+            Pattern::MatchOr(data) => self.visit_pattern_MatchOr(data),
         }
     }
-    fn visit_pattern_MatchValue(&mut self, node: PatternMatchValue) {
+    fn visit_pattern_MatchValue(&mut self, node: PatternMatchValue<R>) {
         self.generic_visit_pattern_MatchValue(node)
     }
-    fn generic_visit_pattern_MatchValue(&mut self, node: PatternMatchValue) {
+    fn generic_visit_pattern_MatchValue(&mut self, node: PatternMatchValue<R>) {
         {
             let value = node.value;
             self.visit_expr(*value);
         }
     }
-    fn visit_pattern_MatchSingleton(&mut self, node: PatternMatchSingleton) {
+    fn visit_pattern_MatchSingleton(&mut self, node: PatternMatchSingleton<R>) {
         self.generic_visit_pattern_MatchSingleton(node)
     }
-    fn generic_visit_pattern_MatchSingleton(&mut self, node: PatternMatchSingleton) {}
-    fn visit_pattern_MatchSequence(&mut self, node: PatternMatchSequence) {
+    fn generic_visit_pattern_MatchSingleton(&mut self, node: PatternMatchSingleton<R>) {}
+    fn visit_pattern_MatchSequence(&mut self, node: PatternMatchSequence<R>) {
         self.generic_visit_pattern_MatchSequence(node)
     }
-    fn generic_visit_pattern_MatchSequence(&mut self, node: PatternMatchSequence) {
+    fn generic_visit_pattern_MatchSequence(&mut self, node: PatternMatchSequence<R>) {
         for value in node.patterns {
             self.visit_pattern(value);
         }
     }
-    fn visit_pattern_MatchMapping(&mut self, node: PatternMatchMapping) {
+    fn visit_pattern_MatchMapping(&mut self, node: PatternMatchMapping<R>) {
         self.generic_visit_pattern_MatchMapping(node)
     }
-    fn generic_visit_pattern_MatchMapping(&mut self, node: PatternMatchMapping) {
+    fn generic_visit_pattern_MatchMapping(&mut self, node: PatternMatchMapping<R>) {
         for value in node.keys {
             self.visit_expr(value);
         }
@@ -784,10 +775,10 @@ pub trait Visitor<U = ()> {
             self.visit_pattern(value);
         }
     }
-    fn visit_pattern_MatchClass(&mut self, node: PatternMatchClass) {
+    fn visit_pattern_MatchClass(&mut self, node: PatternMatchClass<R>) {
         self.generic_visit_pattern_MatchClass(node)
     }
-    fn generic_visit_pattern_MatchClass(&mut self, node: PatternMatchClass) {
+    fn generic_visit_pattern_MatchClass(&mut self, node: PatternMatchClass<R>) {
         {
             let value = node.cls;
             self.visit_expr(*value);
@@ -799,22 +790,22 @@ pub trait Visitor<U = ()> {
             self.visit_pattern(value);
         }
     }
-    fn visit_pattern_MatchStar(&mut self, node: PatternMatchStar) {
+    fn visit_pattern_MatchStar(&mut self, node: PatternMatchStar<R>) {
         self.generic_visit_pattern_MatchStar(node)
     }
-    fn generic_visit_pattern_MatchStar(&mut self, node: PatternMatchStar) {}
-    fn visit_pattern_MatchAs(&mut self, node: PatternMatchAs) {
+    fn generic_visit_pattern_MatchStar(&mut self, node: PatternMatchStar<R>) {}
+    fn visit_pattern_MatchAs(&mut self, node: PatternMatchAs<R>) {
         self.generic_visit_pattern_MatchAs(node)
     }
-    fn generic_visit_pattern_MatchAs(&mut self, node: PatternMatchAs) {
+    fn generic_visit_pattern_MatchAs(&mut self, node: PatternMatchAs<R>) {
         if let Some(value) = node.pattern {
             self.visit_pattern(*value);
         }
     }
-    fn visit_pattern_MatchOr(&mut self, node: PatternMatchOr) {
+    fn visit_pattern_MatchOr(&mut self, node: PatternMatchOr<R>) {
         self.generic_visit_pattern_MatchOr(node)
     }
-    fn generic_visit_pattern_MatchOr(&mut self, node: PatternMatchOr) {
+    fn generic_visit_pattern_MatchOr(&mut self, node: PatternMatchOr<R>) {
         for value in node.patterns {
             self.visit_pattern(value);
         }

ast/src/impls.rs

@@ -1,19 +1,17 @@
-use crate::{Constant, ExprKind};
+use crate::{Constant, Excepthandler, Expr, Pattern, Stmt};
 
-impl<U> ExprKind<U> {
+impl<R> Expr<R> {
     /// Returns a short name for the node suitable for use in error messages.
     pub fn python_name(&self) -> &'static str {
         match self {
-            ExprKind::BoolOp { .. } | ExprKind::BinOp { .. } | ExprKind::UnaryOp { .. } => {
-                "operator"
-            }
-            ExprKind::Subscript { .. } => "subscript",
-            ExprKind::Await { .. } => "await expression",
-            ExprKind::Yield { .. } | ExprKind::YieldFrom { .. } => "yield expression",
-            ExprKind::Compare { .. } => "comparison",
-            ExprKind::Attribute { .. } => "attribute",
-            ExprKind::Call { .. } => "function call",
-            ExprKind::Constant(crate::ExprConstant { value, .. }) => match value {
+            Expr::BoolOp { .. } | Expr::BinOp { .. } | Expr::UnaryOp { .. } => "operator",
+            Expr::Subscript { .. } => "subscript",
+            Expr::Await { .. } => "await expression",
+            Expr::Yield { .. } | Expr::YieldFrom { .. } => "yield expression",
+            Expr::Compare { .. } => "comparison",
+            Expr::Attribute { .. } => "attribute",
+            Expr::Call { .. } => "function call",
+            Expr::Constant(crate::ExprConstant { value, .. }) => match value {
                 Constant::Str(_)
                 | Constant::Int(_)
                 | Constant::Float(_)
@@ -30,31 +28,37 @@ impl<U> ExprKind<U> {
                 Constant::None => "None",
                 Constant::Ellipsis => "ellipsis",
             },
-            ExprKind::List { .. } => "list",
-            ExprKind::Tuple { .. } => "tuple",
-            ExprKind::Dict { .. } => "dict display",
-            ExprKind::Set { .. } => "set display",
-            ExprKind::ListComp { .. } => "list comprehension",
-            ExprKind::DictComp { .. } => "dict comprehension",
-            ExprKind::SetComp { .. } => "set comprehension",
-            ExprKind::GeneratorExp { .. } => "generator expression",
-            ExprKind::Starred { .. } => "starred",
-            ExprKind::Slice { .. } => "slice",
-            ExprKind::JoinedStr(crate::ExprJoinedStr { values }) => {
-                if values
-                    .iter()
-                    .any(|e| matches!(e.node, ExprKind::JoinedStr { .. }))
-                {
+            Expr::List { .. } => "list",
+            Expr::Tuple { .. } => "tuple",
+            Expr::Dict { .. } => "dict display",
+            Expr::Set { .. } => "set display",
+            Expr::ListComp { .. } => "list comprehension",
+            Expr::DictComp { .. } => "dict comprehension",
+            Expr::SetComp { .. } => "set comprehension",
+            Expr::GeneratorExp { .. } => "generator expression",
+            Expr::Starred { .. } => "starred",
+            Expr::Slice { .. } => "slice",
+            Expr::JoinedStr(crate::ExprJoinedStr { values, .. }) => {
+                if values.iter().any(|e| e.is_joined_str_expr()) {
                     "f-string expression"
                 } else {
                     "literal"
                 }
             }
-            ExprKind::FormattedValue { .. } => "f-string expression",
-            ExprKind::Name { .. } => "name",
-            ExprKind::Lambda { .. } => "lambda",
-            ExprKind::IfExp { .. } => "conditional expression",
-            ExprKind::NamedExpr { .. } => "named expression",
+            Expr::FormattedValue { .. } => "f-string expression",
+            Expr::Name { .. } => "name",
+            Expr::Lambda { .. } => "lambda",
+            Expr::IfExp { .. } => "conditional expression",
+            Expr::NamedExpr { .. } => "named expression",
         }
     }
 }
+
+#[cfg(target_arch = "x86_64")]
+static_assertions::assert_eq_size!(Expr, [u8; 72]);
+#[cfg(target_arch = "x86_64")]
+static_assertions::assert_eq_size!(Stmt, [u8; 136]);
+#[cfg(target_arch = "x86_64")]
+static_assertions::assert_eq_size!(Pattern, [u8; 96]);
+#[cfg(target_arch = "x86_64")]
+static_assertions::assert_eq_size!(Excepthandler, [u8; 64]);

ast/src/lib.rs

@@ -8,6 +8,7 @@ mod generic {
     include!("gen/generic.rs");
 }
 mod impls;
+mod ranged;
 #[cfg(feature = "location")]
 mod source_locator;
 #[cfg(feature = "unparse")]
@@ -15,13 +16,13 @@ mod unparse;
 
 pub use builtin::*;
 pub use generic::*;
+pub use ranged::{EmptyRange, OptionalRange, Ranged, Suite};
 pub use rustpython_parser_core::{text_size, ConversionFlag};
 
-pub type Suite<U = ()> = Vec<Stmt<U>>;
-
 #[cfg(feature = "fold")]
 pub mod fold {
     use super::generic::*;
+
     include!("gen/fold.rs");
 }
 
@@ -33,9 +34,7 @@ mod visitor {
 }
 
 #[cfg(feature = "location")]
-pub mod located {
-    include!("gen/located.rs");
-}
+pub mod located;
 
 #[cfg(feature = "location")]
 pub use rustpython_parser_core::source_code;

ast/src/located.rs

@@ -0,0 +1,19 @@
+#![allow(clippy::derive_partial_eq_without_eq)]
+use crate::source_code::{SourceLocation, SourceRange};
+
+pub trait Located {
+    fn range(&self) -> SourceRange;
+
+    fn location(&self) -> SourceLocation {
+        self.range().start
+    }
+
+    fn end_location(&self) -> Option<SourceLocation> {
+        self.range().end
+    }
+}
+
+pub type Suite = Vec<Stmt>;
+
+pub use crate::builtin::*;
+include!("gen/located.rs");

ast/src/optimizer.rs

@@ -20,35 +20,29 @@ impl<U> crate::fold::Fold<U> for ConstantOptimizer {
         Ok(user)
     }
     fn fold_expr(&mut self, node: crate::Expr<U>) -> Result<crate::Expr<U>, Self::Error> {
-        match node.node {
-            crate::ExprKind::Tuple(crate::ExprTuple { elts, ctx }) => {
+        match node {
+            crate::Expr::Tuple(crate::ExprTuple { elts, ctx, range }) => {
                 let elts = elts
                     .into_iter()
                     .map(|x| self.fold_expr(x))
                     .collect::<Result<Vec<_>, _>>()?;
-                let expr = if elts
-                    .iter()
-                    .all(|e| matches!(e.node, crate::ExprKind::Constant { .. }))
-                {
+                let expr = if elts.iter().all(|e| e.is_constant_expr()) {
                     let tuple = elts
                         .into_iter()
-                        .map(|e| match e.node {
-                            crate::ExprKind::Constant(crate::ExprConstant { value, .. }) => value,
+                        .map(|e| match e {
+                            crate::Expr::Constant(crate::ExprConstant { value, .. }) => value,
                             _ => unreachable!(),
                         })
                         .collect();
-                    crate::ExprKind::Constant(crate::ExprConstant {
+                    crate::Expr::Constant(crate::ExprConstant {
                         value: Constant::Tuple(tuple),
                         kind: None,
+                        range,
                     })
                 } else {
-                    crate::ExprKind::Tuple(crate::ExprTuple { elts, ctx })
+                    crate::Expr::Tuple(crate::ExprTuple { elts, ctx, range })
                 };
-                Ok(crate::Expr {
-                    node: expr,
-                    custom: node.custom,
-                    range: node.range,
-                })
+                Ok(expr)
             }
             _ => crate::fold::fold_expr(self, node),
         }
@@ -66,95 +60,68 @@ mod tests {
         use crate::{fold::Fold, *};
 
         let range = TextRange::default();
-        #[allow(clippy::let_unit_value)]
-        let custom = ();
-        let ast = Attributed {
+        let ast = ExprTuple {
+            ctx: ExprContext::Load,
+            elts: vec![
+                ExprConstant {
+                    value: BigInt::from(1).into(),
+                    kind: None,
+                    range,
+                }
+                .into(),
+                ExprConstant {
+                    value: BigInt::from(2).into(),
+                    kind: None,
+                    range,
+                }
+                .into(),
+                ExprTuple {
+                    ctx: ExprContext::Load,
+                    elts: vec![
+                        ExprConstant {
+                            value: BigInt::from(3).into(),
+                            kind: None,
+                            range,
+                        }
+                        .into(),
+                        ExprConstant {
+                            value: BigInt::from(4).into(),
+                            kind: None,
+                            range,
+                        }
+                        .into(),
+                        ExprConstant {
+                            value: BigInt::from(5).into(),
+                            kind: None,
+                            range,
+                        }
+                        .into(),
+                    ],
+                    range,
+                }
+                .into(),
+            ],
             range,
-            custom,
-            node: ExprTuple {
-                ctx: ExprContext::Load,
-                elts: vec![
-                    Attributed {
-                        range,
-                        custom,
-                        node: ExprConstant {
-                            value: BigInt::from(1).into(),
-                            kind: None,
-                        }
-                        .into(),
-                    },
-                    Attributed {
-                        range,
-                        custom,
-                        node: ExprConstant {
-                            value: BigInt::from(2).into(),
-                            kind: None,
-                        }
-                        .into(),
-                    },
-                    Attributed {
-                        range,
-                        custom,
-                        node: ExprTuple {
-                            ctx: ExprContext::Load,
-                            elts: vec![
-                                Attributed {
-                                    range,
-                                    custom,
-                                    node: ExprConstant {
-                                        value: BigInt::from(3).into(),
-                                        kind: None,
-                                    }
-                                    .into(),
-                                },
-                                Attributed {
-                                    range,
-                                    custom,
-                                    node: ExprConstant {
-                                        value: BigInt::from(4).into(),
-                                        kind: None,
-                                    }
-                                    .into(),
-                                },
-                                Attributed {
-                                    range,
-                                    custom,
-                                    node: ExprConstant {
-                                        value: BigInt::from(5).into(),
-                                        kind: None,
-                                    }
-                                    .into(),
-                                },
-                            ],
-                        }
-                        .into(),
-                    },
-                ],
-            }
-            .into(),
         };
         let new_ast = ConstantOptimizer::new()
-            .fold_expr(ast)
+            .fold_expr(ast.into())
             .unwrap_or_else(|e| match e {});
         assert_eq!(
             new_ast,
-            Attributed {
+            ExprConstant {
+                value: Constant::Tuple(vec![
+                    BigInt::from(1).into(),
+                    BigInt::from(2).into(),
+                    Constant::Tuple(vec![
+                        BigInt::from(3).into(),
+                        BigInt::from(4).into(),
+                        BigInt::from(5).into(),
+                    ])
+                ]),
+                kind: None,
                 range,
-                custom,
-                node: ExprConstant {
-                    value: Constant::Tuple(vec![
-                        BigInt::from(1).into(),
-                        BigInt::from(2).into(),
-                        Constant::Tuple(vec![
-                            BigInt::from(3).into(),
-                            BigInt::from(4).into(),
-                            BigInt::from(5).into(),
-                        ])
-                    ]),
-                    kind: None
-                }
-                .into(),
             }
+            .into(),
         );
     }
 }

ast/src/ranged.rs

@@ -0,0 +1,62 @@
+use crate::text_size::{TextRange, TextSize};
+use std::fmt::{Debug, Display, Formatter};
+use std::marker::PhantomData;
+
+pub use crate::builtin::*;
+use crate::Stmt;
+
+pub trait Ranged {
+    fn range(&self) -> TextRange;
+
+    fn start(&self) -> TextSize {
+        self.range().start()
+    }
+
+    fn end(&self) -> TextSize {
+        self.range().end()
+    }
+}
+
+pub type Suite<R = TextRange> = Vec<Stmt<R>>;
+
+#[cfg(feature = "all-nodes-with-ranges")]
+pub type OptionalRange<R> = R;
+
+#[cfg(not(feature = "all-nodes-with-ranges"))]
+pub type OptionalRange<R> = EmptyRange<R>;
+
+#[derive(Eq, PartialEq, Hash, Copy, Clone)]
+pub struct EmptyRange<R> {
+    phantom: PhantomData<R>,
+}
+
+impl<R> EmptyRange<R> {
+    #[inline(always)]
+    pub fn new(_start: TextSize, _end: TextSize) -> Self {
+        Self {
+            phantom: PhantomData,
+        }
+    }
+}
+
+impl<R> Display for EmptyRange<R> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.write_str("()")
+    }
+}
+
+impl<R> Debug for EmptyRange<R> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        Display::fmt(self, f)
+    }
+}
+
+impl<R> Default for EmptyRange<R> {
+    fn default() -> Self {
+        EmptyRange {
+            phantom: PhantomData,
+        }
+    }
+}
+
+include!("gen/ranged.rs");

ast/src/source_locator.rs

@@ -1,39 +1,15 @@
-use crate::builtin::Attributed;
-use rustpython_parser_core::source_code::{SourceLocation, SourceLocator, SourceRange};
+use rustpython_parser_core::{
+    source_code::{SourceLocator, SourceRange},
+    text_size::TextRange,
+};
 
-impl crate::fold::Fold<()> for SourceLocator<'_> {
+impl crate::fold::Fold<TextRange> for SourceLocator<'_> {
     type TargetU = SourceRange;
     type Error = std::convert::Infallible;
 
-    #[cold]
-    fn map_user(&mut self, _user: ()) -> Result<Self::TargetU, Self::Error> {
-        unreachable!("implemented map_attributed");
-    }
-
-    fn map_attributed<T>(
-        &mut self,
-        node: Attributed<T, ()>,
-    ) -> Result<Attributed<T, Self::TargetU>, Self::Error> {
-        let start = self.locate(node.range.start());
-        let end = self.locate(node.range.end());
-        Ok(Attributed {
-            range: node.range,
-            custom: (start..end).into(),
-            node: node.node,
-        })
-    }
-}
-
-impl<T> Attributed<T, SourceRange> {
-    /// Returns the absolute start position of the node from the beginning of the document.
-    #[inline]
-    pub const fn location(&self) -> SourceLocation {
-        self.custom.start
-    }
-
-    /// Returns the absolute position at which the node ends in the source document.
-    #[inline]
-    pub const fn end_location(&self) -> Option<SourceLocation> {
-        self.custom.end
+    fn map_user(&mut self, user: TextRange) -> Result<Self::TargetU, Self::Error> {
+        let start = self.locate(user.start());
+        let end = self.locate(user.end());
+        Ok((start..end).into())
     }
 }

ast/src/unparse.rs

@@ -1,7 +1,5 @@
 use crate::ConversionFlag;
-use crate::{
-    Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, Expr, ExprKind, Identifier, Operator,
-};
+use crate::{Arg, Arguments, Boolop, Cmpop, Comprehension, Constant, Expr, Identifier, Operator};
 use std::fmt;
 
 mod precedence {
@@ -73,8 +71,12 @@ impl<'a> Unparser<'a> {
                 ret
             }};
         }
-        match &ast.node {
-            ExprKind::BoolOp(crate::ExprBoolOp { op, values }) => {
+        match &ast {
+            Expr::BoolOp(crate::ExprBoolOp {
+                op,
+                values,
+                range: _range,
+            }) => {
                 let (op, prec) = op_prec!(bin, op, Boolop, And("and", AND), Or("or", OR));
                 group_if!(prec, {
                     let mut first = true;
@@ -84,14 +86,23 @@ impl<'a> Unparser<'a> {
                     }
                 })
             }
-            ExprKind::NamedExpr(crate::ExprNamedExpr { target, value }) => {
+            Expr::NamedExpr(crate::ExprNamedExpr {
+                target,
+                value,
+                range: _range,
+            }) => {
                 group_if!(precedence::TUPLE, {
                     self.unparse_expr(target, precedence::ATOM)?;
                     self.p(" := ")?;
                     self.unparse_expr(value, precedence::ATOM)?;
                 })
             }
-            ExprKind::BinOp(crate::ExprBinOp { left, op, right }) => {
+            Expr::BinOp(crate::ExprBinOp {
+                left,
+                op,
+                right,
+                range: _range,
+            }) => {
                 let right_associative = matches!(op, Operator::Pow);
                 let (op, prec) = op_prec!(
                     bin,
@@ -117,7 +128,11 @@ impl<'a> Unparser<'a> {
                     self.unparse_expr(right, prec + !right_associative as u8)?;
                 })
             }
-            ExprKind::UnaryOp(crate::ExprUnaryOp { op, operand }) => {
+            Expr::UnaryOp(crate::ExprUnaryOp {
+                op,
+                operand,
+                range: _range,
+            }) => {
                 let (op, prec) = op_prec!(
                     un,
                     op,
@@ -132,7 +147,11 @@ impl<'a> Unparser<'a> {
                     self.unparse_expr(operand, prec)?;
                 })
             }
-            ExprKind::Lambda(crate::ExprLambda { args, body }) => {
+            Expr::Lambda(crate::ExprLambda {
+                args,
+                body,
+                range: _range,
+            }) => {
                 group_if!(precedence::TEST, {
                     let pos = args.args.len() + args.posonlyargs.len();
                     self.p(if pos > 0 { "lambda " } else { "lambda" })?;
@@ -140,7 +159,12 @@ impl<'a> Unparser<'a> {
                     write!(self, ": {}", **body)?;
                 })
             }
-            ExprKind::IfExp(crate::ExprIfExp { test, body, orelse }) => {
+            Expr::IfExp(crate::ExprIfExp {
+                test,
+                body,
+                orelse,
+                range: _range,
+            }) => {
                 group_if!(precedence::TEST, {
                     self.unparse_expr(body, precedence::TEST + 1)?;
                     self.p(" if ")?;
@@ -149,7 +173,11 @@ impl<'a> Unparser<'a> {
                     self.unparse_expr(orelse, precedence::TEST)?;
                 })
             }
-            ExprKind::Dict(crate::ExprDict { keys, values }) => {
+            Expr::Dict(crate::ExprDict {
+                keys,
+                values,
+                range: _range,
+            }) => {
                 self.p("{")?;
                 let mut first = true;
                 let (packed, unpacked) = values.split_at(keys.len());
@@ -167,7 +195,10 @@ impl<'a> Unparser<'a> {
                 }
                 self.p("}")?;
             }
-            ExprKind::Set(crate::ExprSet { elts }) => {
+            Expr::Set(crate::ExprSet {
+                elts,
+                range: _range,
+            }) => {
                 self.p("{")?;
                 let mut first = true;
                 for v in elts {
@@ -176,22 +207,31 @@ impl<'a> Unparser<'a> {
                 }
                 self.p("}")?;
             }
-            ExprKind::ListComp(crate::ExprListComp { elt, generators }) => {
+            Expr::ListComp(crate::ExprListComp {
+                elt,
+                generators,
+                range: _range,
+            }) => {
                 self.p("[")?;
                 self.unparse_expr(elt, precedence::TEST)?;
                 self.unparse_comp(generators)?;
                 self.p("]")?;
             }
-            ExprKind::SetComp(crate::ExprSetComp { elt, generators }) => {
+            Expr::SetComp(crate::ExprSetComp {
+                elt,
+                generators,
+                range: _range,
+            }) => {
                 self.p("{")?;
                 self.unparse_expr(elt, precedence::TEST)?;
                 self.unparse_comp(generators)?;
                 self.p("}")?;
             }
-            ExprKind::DictComp(crate::ExprDictComp {
+            Expr::DictComp(crate::ExprDictComp {
                 key,
                 value,
                 generators,
+                range: _range,
             }) => {
                 self.p("{")?;
                 self.unparse_expr(key, precedence::TEST)?;
@@ -200,32 +240,46 @@ impl<'a> Unparser<'a> {
                 self.unparse_comp(generators)?;
                 self.p("}")?;
             }
-            ExprKind::GeneratorExp(crate::ExprGeneratorExp { elt, generators }) => {
+            Expr::GeneratorExp(crate::ExprGeneratorExp {
+                elt,
+                generators,
+                range: _range,
+            }) => {
                 self.p("(")?;
                 self.unparse_expr(elt, precedence::TEST)?;
                 self.unparse_comp(generators)?;
                 self.p(")")?;
             }
-            ExprKind::Await(crate::ExprAwait { value }) => {
+            Expr::Await(crate::ExprAwait {
+                value,
+                range: _range,
+            }) => {
                 group_if!(precedence::AWAIT, {
                     self.p("await ")?;
                     self.unparse_expr(value, precedence::ATOM)?;
                 })
             }
-            ExprKind::Yield(crate::ExprYield { value }) => {
+            Expr::Yield(crate::ExprYield {
+                value,
+                range: _range,
+            }) => {
                 if let Some(value) = value {
                     write!(self, "(yield {})", **value)?;
                 } else {
                     self.p("(yield)")?;
                 }
             }
-            ExprKind::YieldFrom(crate::ExprYieldFrom { value }) => {
+            Expr::YieldFrom(crate::ExprYieldFrom {
+                value,
+                range: _range,
+            }) => {
                 write!(self, "(yield from {})", **value)?;
             }
-            ExprKind::Compare(crate::ExprCompare {
+            Expr::Compare(crate::ExprCompare {
                 left,
                 ops,
                 comparators,
+                range: _range,
             }) => {
                 group_if!(precedence::CMP, {
                     let new_lvl = precedence::CMP + 1;
@@ -248,18 +302,20 @@ impl<'a> Unparser<'a> {
                     }
                 })
             }
-            ExprKind::Call(crate::ExprCall {
+            Expr::Call(crate::ExprCall {
                 func,
                 args,
                 keywords,
+                range: _range,
             }) => {
                 self.unparse_expr(func, precedence::ATOM)?;
                 self.p("(")?;
                 if let (
-                    [Expr {
-                        node: ExprKind::GeneratorExp(crate::ExprGeneratorExp { elt, generators }),
-                        ..
-                    }],
+                    [Expr::GeneratorExp(crate::ExprGeneratorExp {
+                        elt,
+                        generators,
+                        range: _range,
+                    })],
                     [],
                 ) = (&**args, &**keywords)
                 {
@@ -274,26 +330,32 @@ impl<'a> Unparser<'a> {
                     }
                     for kw in keywords {
                         self.p_delim(&mut first, ", ")?;
-                        if let Some(arg) = &kw.node.arg {
+                        if let Some(arg) = &kw.arg {
                             self.p_id(arg)?;
                             self.p("=")?;
                         } else {
                             self.p("**")?;
                         }
-                        self.unparse_expr(&kw.node.value, precedence::TEST)?;
+                        self.unparse_expr(&kw.value, precedence::TEST)?;
                     }
                 }
                 self.p(")")?;
             }
-            ExprKind::FormattedValue(crate::ExprFormattedValue {
+            Expr::FormattedValue(crate::ExprFormattedValue {
                 value,
                 conversion,
                 format_spec,
+                range: _range,
             }) => self.unparse_formatted(value, conversion.to_u32(), format_spec.as_deref())?,
-            ExprKind::JoinedStr(crate::ExprJoinedStr { values }) => {
-                self.unparse_joined_str(values, false)?
-            }
-            ExprKind::Constant(crate::ExprConstant { value, kind }) => {
+            Expr::JoinedStr(crate::ExprJoinedStr {
+                values,
+                range: _range,
+            }) => self.unparse_joined_str(values, false)?,
+            Expr::Constant(crate::ExprConstant {
+                value,
+                kind,
+                range: _range,
+            }) => {
                 if let Some(kind) = kind {
                     self.p(kind)?;
                 }
@@ -309,12 +371,12 @@ impl<'a> Unparser<'a> {
                     _ => fmt::Display::fmt(value, &mut self.f)?,
                 }
             }
-            ExprKind::Attribute(crate::ExprAttribute { value, attr, .. }) => {
+            Expr::Attribute(crate::ExprAttribute { value, attr, .. }) => {
                 self.unparse_expr(value, precedence::ATOM)?;
-                let period = if let ExprKind::Constant(crate::ExprConstant {
+                let period = if let Expr::Constant(crate::ExprConstant {
                     value: Constant::Int(_),
                     ..
-                }) = &value.node
+                }) = value.as_ref()
                 {
                     " ."
                 } else {
@@ -323,14 +385,11 @@ impl<'a> Unparser<'a> {
                 self.p(period)?;
                 self.p_id(attr)?;
             }
-            ExprKind::Subscript(crate::ExprSubscript { value, slice, .. }) => {
+            Expr::Subscript(crate::ExprSubscript { value, slice, .. }) => {
                 self.unparse_expr(value, precedence::ATOM)?;
                 let mut lvl = precedence::TUPLE;
-                if let ExprKind::Tuple(crate::ExprTuple { elts, .. }) = &slice.node {
-                    if elts
-                        .iter()
-                        .any(|expr| matches!(expr.node, ExprKind::Starred { .. }))
-                    {
+                if let Expr::Tuple(crate::ExprTuple { elts, .. }) = slice.as_ref() {
+                    if elts.iter().any(|expr| expr.is_starred_expr()) {
                         lvl += 1
                     }
                 }
@@ -338,12 +397,12 @@ impl<'a> Unparser<'a> {
                 self.unparse_expr(slice, lvl)?;
                 self.p("]")?;
             }
-            ExprKind::Starred(crate::ExprStarred { value, .. }) => {
+            Expr::Starred(crate::ExprStarred { value, .. }) => {
                 self.p("*")?;
                 self.unparse_expr(value, precedence::EXPR)?;
             }
-            ExprKind::Name(crate::ExprName { id, .. }) => self.p_id(id)?,
-            ExprKind::List(crate::ExprList { elts, .. }) => {
+            Expr::Name(crate::ExprName { id, .. }) => self.p_id(id)?,
+            Expr::List(crate::ExprList { elts, .. }) => {
                 self.p("[")?;
                 let mut first = true;
                 for elt in elts {
@@ -352,7 +411,7 @@ impl<'a> Unparser<'a> {
                 }
                 self.p("]")?;
             }
-            ExprKind::Tuple(crate::ExprTuple { elts, .. }) => {
+            Expr::Tuple(crate::ExprTuple { elts, .. }) => {
                 if elts.is_empty() {
                     self.p("()")?;
                 } else {
@@ -366,7 +425,12 @@ impl<'a> Unparser<'a> {
                     })
                 }
             }
-            ExprKind::Slice(crate::ExprSlice { lower, upper, step }) => {
+            Expr::Slice(crate::ExprSlice {
+                lower,
+                upper,
+                step,
+                range: _range,
+            }) => {
                 if let Some(lower) = lower {
                     self.unparse_expr(lower, precedence::TEST)?;
                 }
@@ -420,8 +484,8 @@ impl<'a> Unparser<'a> {
         Ok(())
     }
     fn unparse_arg<U>(&mut self, arg: &Arg<U>) -> fmt::Result {
-        self.p_id(&arg.node.arg)?;
-        if let Some(ann) = &arg.node.annotation {
+        self.p_id(&arg.arg)?;
+        if let Some(ann) = &arg.annotation {
             write!(self, ": {}", **ann)?;
         }
         Ok(())
@@ -487,21 +551,23 @@ impl<'a> Unparser<'a> {
     }
 
     fn unparse_fstring_elem<U>(&mut self, expr: &Expr<U>, is_spec: bool) -> fmt::Result {
-        match &expr.node {
-            ExprKind::Constant(crate::ExprConstant { value, .. }) => {
+        match &expr {
+            Expr::Constant(crate::ExprConstant { value, .. }) => {
                 if let Constant::Str(s) = value {
                     self.unparse_fstring_str(s)
                 } else {
                     unreachable!()
                 }
             }
-            ExprKind::JoinedStr(crate::ExprJoinedStr { values }) => {
-                self.unparse_joined_str(values, is_spec)
-            }
-            ExprKind::FormattedValue(crate::ExprFormattedValue {
+            Expr::JoinedStr(crate::ExprJoinedStr {
+                values,
+                range: _range,
+            }) => self.unparse_joined_str(values, is_spec),
+            Expr::FormattedValue(crate::ExprFormattedValue {
                 value,
                 conversion,
                 format_spec,
+                range: _range,
             }) => self.unparse_formatted(value, conversion.to_u32(), format_spec.as_deref()),
             _ => unreachable!(),
         }

core/Cargo.toml

@@ -16,4 +16,4 @@ serde = { version = "1.0.133", optional = true, default-features = false, featur
 
 [features]
 default = []
-location = ["ruff_source_location"]
+location = ["dep:ruff_source_location"]

core/src/source_code.rs

@@ -3,7 +3,7 @@ pub use ruff_source_location::*;
 
 pub type LineNumber = OneIndexed;
 
-#[derive(Debug)]
+#[derive(Debug, Copy, Clone)]
 pub struct SourceRange {
     pub start: SourceLocation,
     pub end: Option<SourceLocation>,

parser/Cargo.toml

@@ -10,8 +10,9 @@ edition = "2021"
 
 [features]
 default = ["location"]
-location = ["rustpython-ast/location"]
+location = ["rustpython-ast/location", "rustpython-parser-core/location"]
 serde = ["dep:serde", "rustpython-parser-core/serde"]
+all-nodes-with-ranges = ["rustpython-ast/all-nodes-with-ranges"]
 
 [build-dependencies]
 anyhow = { workspace = true }
@@ -37,4 +38,4 @@ rustc-hash = "1.1.0"
 serde = { version = "1.0.133", optional = true, default-features = false, features = ["derive"] }
 
 [dev-dependencies]
-insta = { workspace = true }
+insta = { workspace = true }

parser/src/context.rs

@@ -1,49 +1,48 @@
-use crate::ast::{self, Expr, ExprContext, ExprKind};
+use crate::ast::{self, Expr, ExprContext};
 
 pub(crate) fn set_context(expr: Expr, ctx: ExprContext) -> Expr {
-    match expr.node {
-        ExprKind::Name(ast::ExprName { id, .. }) => Expr {
-            node: ast::ExprName { id, ctx }.into(),
-            ..expr
-        },
-        ExprKind::Tuple(ast::ExprTuple { elts, .. }) => Expr {
-            node: ast::ExprTuple {
-                elts: elts
-                    .into_iter()
-                    .map(|elt| set_context(elt, ctx.clone()))
-                    .collect(),
-                ctx,
-            }
-            .into(),
-            ..expr
-        },
-        ExprKind::List(ast::ExprList { elts, .. }) => Expr {
-            node: ast::ExprList {
-                elts: elts
-                    .into_iter()
-                    .map(|elt| set_context(elt, ctx.clone()))
-                    .collect(),
-                ctx,
-            }
-            .into(),
-            ..expr
-        },
-        ExprKind::Attribute(ast::ExprAttribute { value, attr, .. }) => Expr {
-            node: ast::ExprAttribute { value, attr, ctx }.into(),
-            ..expr
-        },
-        ExprKind::Subscript(ast::ExprSubscript { value, slice, .. }) => Expr {
-            node: ast::ExprSubscript { value, slice, ctx }.into(),
-            ..expr
-        },
-        ExprKind::Starred(ast::ExprStarred { value, .. }) => Expr {
-            node: ast::ExprStarred {
-                value: Box::new(set_context(*value, ctx.clone())),
-                ctx,
-            }
-            .into(),
-            ..expr
-        },
+    match expr {
+        Expr::Name(ast::ExprName { id, range, .. }) => ast::ExprName { id, ctx, range }.into(),
+        Expr::Tuple(ast::ExprTuple { elts, range, .. }) => ast::ExprTuple {
+            elts: elts.into_iter().map(|elt| set_context(elt, ctx)).collect(),
+            range,
+            ctx,
+        }
+        .into(),
+
+        Expr::List(ast::ExprList { elts, range, .. }) => ast::ExprList {
+            elts: elts.into_iter().map(|elt| set_context(elt, ctx)).collect(),
+            range,
+            ctx,
+        }
+        .into(),
+        Expr::Attribute(ast::ExprAttribute {
+            value, attr, range, ..
+        }) => ast::ExprAttribute {
+            value,
+            attr,
+            range,
+            ctx,
+        }
+        .into(),
+        Expr::Subscript(ast::ExprSubscript {
+            value,
+            slice,
+            range,
+            ..
+        }) => ast::ExprSubscript {
+            value,
+            slice,
+            range,
+            ctx,
+        }
+        .into(),
+        Expr::Starred(ast::ExprStarred { value, range, .. }) => ast::ExprStarred {
+            value: Box::new(set_context(*value, ctx)),
+            range,
+            ctx,
+        }
+        .into(),
         _ => expr,
     }
 }
@@ -67,6 +66,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_assign_list() {
         let source = "[x, y] = (1, 2, 3)";
         let parse_ast = parse_program(source, "<test>").unwrap();
@@ -102,6 +102,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_assign_list_comp() {
         let source = "x = [y for y in (1, 2, 3)]";
         let parse_ast = parse_program(source, "<test>").unwrap();
@@ -109,6 +110,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_assign_set_comp() {
         let source = "x = {y for y in (1, 2, 3)}";
         let parse_ast = parse_program(source, "<test>").unwrap();
@@ -116,6 +118,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_assign_with() {
         let source = "with 1 as x: pass";
         let parse_ast = parse_program(source, "<test>").unwrap();

parser/src/function.rs

@@ -1,11 +1,13 @@
 // Contains functions that perform validation and parsing of arguments and parameters.
 // Checks apply both to functions and to lambdas.
+use crate::text_size::TextRange;
 use crate::{
     ast,
     lexer::{LexicalError, LexicalErrorType},
     text_size::TextSize,
 };
 use rustc_hash::FxHashSet;
+use rustpython_ast::Ranged;
 
 pub(crate) struct ArgumentList {
     pub args: Vec<ast::Expr>,
@@ -19,7 +21,7 @@ type ParameterDef = (ast::Arg, Option<ast::Expr>);
 pub(crate) fn validate_arguments(
     arguments: ast::Arguments,
 ) -> Result<ast::Arguments, LexicalError> {
-    let mut all_args: Vec<&ast::Attributed<ast::ArgData>> = vec![];
+    let mut all_args: Vec<&ast::Arg> = vec![];
 
     all_args.extend(arguments.posonlyargs.iter());
     all_args.extend(arguments.args.iter());
@@ -116,13 +118,11 @@ pub(crate) fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentLis
                     double_starred = true;
                 }
 
-                keywords.push(ast::Keyword::new(
-                    start..end,
-                    ast::KeywordData {
-                        arg: name.map(ast::Identifier::new),
-                        value,
-                    },
-                ));
+                keywords.push(ast::Keyword {
+                    arg: name.map(ast::Identifier::new),
+                    value,
+                    range: TextRange::new(start, end),
+                });
             }
             None => {
                 // Positional arguments mustn't follow keyword arguments.
@@ -148,8 +148,8 @@ pub(crate) fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentLis
 }
 
 // Check if an expression is a starred expression.
-fn is_starred(exp: &ast::Expr) -> bool {
-    matches!(exp.node, ast::ExprKind::Starred { .. })
+const fn is_starred(exp: &ast::Expr) -> bool {
+    exp.is_starred_expr()
 }
 
 #[cfg(test)]
@@ -157,6 +157,7 @@ mod tests {
     use super::*;
     use crate::parser::{parse_program, ParseErrorType};
 
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     macro_rules! function_and_lambda {
         ($($name:ident: $code:expr,)*) => {
             $(
@@ -169,6 +170,7 @@ mod tests {
         }
     }
 
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     function_and_lambda! {
         test_function_no_args: "def f(): pass",
         test_function_pos_args: "def f(a, b, c): pass",

parser/src/parser.rs

@@ -23,7 +23,9 @@ use crate::{
 use itertools::Itertools;
 use std::iter;
 
+use crate::text_size::TextRange;
 pub(super) use lalrpop_util::ParseError as LalrpopError;
+use rustpython_ast::OptionalRange;
 
 /// Parse a full Python program usually consisting of multiple lines.
 ///  
@@ -95,7 +97,7 @@ pub fn parse_expression_starts_at(
     offset: TextSize,
 ) -> Result<ast::Expr, ParseError> {
     parse_starts_at(source, Mode::Expression, path, offset).map(|top| match top {
-        ast::Mod::Expression(ast::ModExpression { body }) => *body,
+        ast::Mod::Expression(ast::ModExpression { body, .. }) => *body,
         _ => unreachable!(),
     })
 }
@@ -318,6 +320,11 @@ impl ParseErrorType {
     }
 }
 
+#[inline(always)]
+pub(super) fn optional_range(start: TextSize, end: TextSize) -> OptionalRange<TextRange> {
+    OptionalRange::<TextRange>::new(start, end)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -371,6 +378,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_parse_lambda() {
         let source = "lambda x, y: x * y"; // lambda(x, y): x * y";
         let parse_ast = parse_program(source, "<test>").unwrap();
@@ -385,6 +393,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_parse_class() {
         let source = "\
 class Foo(A, B):
@@ -397,6 +406,7 @@ class Foo(A, B):
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_parse_dict_comprehension() {
         let source = "{x1: x2 for y in z}";
         let parse_ast = parse_expression(source, "<test>").unwrap();
@@ -404,6 +414,7 @@ class Foo(A, B):
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_parse_list_comprehension() {
         let source = "[x for y in z]";
         let parse_ast = parse_expression(source, "<test>").unwrap();
@@ -411,6 +422,7 @@ class Foo(A, B):
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_parse_double_list_comprehension() {
         let source = "[x for y, y2 in z for a in b if a < 5 if a > 10]";
         let parse_ast = parse_expression(source, "<test>").unwrap();
@@ -418,6 +430,7 @@ class Foo(A, B):
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_parse_generator_comprehension() {
         let source = "(x for y in z)";
         let parse_ast = parse_expression(source, "<test>").unwrap();
@@ -425,6 +438,7 @@ class Foo(A, B):
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_parse_named_expression_generator_comprehension() {
         let source = "(x := y + 1 for y in z)";
         let parse_ast = parse_expression(source, "<test>").unwrap();
@@ -432,6 +446,7 @@ class Foo(A, B):
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_parse_if_else_generator_comprehension() {
         let source = "(x if y else y for y in z)";
         let parse_ast = parse_expression(source, "<test>").unwrap();
@@ -460,6 +475,7 @@ class Foo(A, B):
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_with_statement() {
         let source = "\
 with 0: pass
@@ -529,6 +545,7 @@ array[3:5, *indexes_to_select]
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_generator_expression_argument() {
         let source = r#"' '.join(
     sql
@@ -588,6 +605,7 @@ except* OSError as e:
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_match_as_identifier() {
         let parse_ast = parse_program(
             r#"
@@ -620,6 +638,7 @@ print(match(12))
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_patma() {
         let source = r#"# Cases sampled from Lib/test/test_patma.py
 
@@ -791,6 +810,7 @@ match w := x,:
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_match() {
         let parse_ast = parse_program(
             r#"
@@ -821,6 +841,7 @@ match x:
     }
 
     #[test]
+    #[cfg(not(feature = "all-nodes-with-ranges"))]
     fn test_variadic_generics() {
         let parse_ast = parse_program(
             r#"

parser/src/snapshots/rustpython_parser__context__tests__ann_assign_name.snap

@@ -3,51 +3,39 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..10,
-        custom: (),
-        node: AnnAssign(
-            StmtAnnAssign {
-                target: Attributed {
+    AnnAssign(
+        StmtAnnAssign {
+            range: 0..10,
+            target: Name(
+                ExprName {
                     range: 0..1,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "x",
-                            ),
-                            ctx: Store,
-                        },
+                    id: Identifier(
+                        "x",
                     ),
+                    ctx: Store,
                 },
-                annotation: Attributed {
+            ),
+            annotation: Name(
+                ExprName {
                     range: 3..6,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "int",
-                            ),
-                            ctx: Load,
-                        },
+                    id: Identifier(
+                        "int",
                     ),
+                    ctx: Load,
                 },
-                value: Some(
-                    Attributed {
+            ),
+            value: Some(
+                Constant(
+                    ExprConstant {
                         range: 9..10,
-                        custom: (),
-                        node: Constant(
-                            ExprConstant {
-                                value: Int(
-                                    1,
-                                ),
-                                kind: None,
-                            },
+                        value: Int(
+                            1,
                         ),
+                        kind: None,
                     },
                 ),
-                simple: true,
-            },
-        ),
-    },
+            ),
+            simple: true,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap

@@ -3,86 +3,65 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..15,
-        custom: (),
-        node: Assign(
-            StmtAssign {
-                targets: [
-                    Attributed {
+    Assign(
+        StmtAssign {
+            range: 0..15,
+            targets: [
+                Attribute(
+                    ExprAttribute {
                         range: 0..3,
-                        custom: (),
-                        node: Attribute(
-                            ExprAttribute {
-                                value: Attributed {
-                                    range: 0..1,
-                                    custom: (),
-                                    node: Name(
-                                        ExprName {
-                                            id: Identifier(
-                                                "x",
-                                            ),
-                                            ctx: Load,
-                                        },
-                                    ),
-                                },
-                                attr: Identifier(
-                                    "y",
+                        value: Name(
+                            ExprName {
+                                range: 0..1,
+                                id: Identifier(
+                                    "x",
                                 ),
-                                ctx: Store,
+                                ctx: Load,
                             },
                         ),
+                        attr: Identifier(
+                            "y",
+                        ),
+                        ctx: Store,
                     },
-                ],
-                value: Attributed {
+                ),
+            ],
+            value: Tuple(
+                ExprTuple {
                     range: 6..15,
-                    custom: (),
-                    node: Tuple(
-                        ExprTuple {
-                            elts: [
-                                Attributed {
-                                    range: 7..8,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 10..11,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                2,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 13..14,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                3,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                            ctx: Load,
-                        },
-                    ),
+                    elts: [
+                        Constant(
+                            ExprConstant {
+                                range: 7..8,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 10..11,
+                                value: Int(
+                                    2,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 13..14,
+                                value: Int(
+                                    3,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    ctx: Load,
                 },
-                type_comment: None,
-            },
-        ),
-    },
+            ),
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap

@@ -3,80 +3,62 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..24,
-        custom: (),
-        node: For(
-            StmtFor {
-                target: Attributed {
+    For(
+        StmtFor {
+            range: 0..24,
+            target: Name(
+                ExprName {
                     range: 4..5,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "x",
-                            ),
-                            ctx: Store,
-                        },
+                    id: Identifier(
+                        "x",
                     ),
+                    ctx: Store,
                 },
-                iter: Attributed {
+            ),
+            iter: Tuple(
+                ExprTuple {
                     range: 9..18,
-                    custom: (),
-                    node: Tuple(
-                        ExprTuple {
-                            elts: [
-                                Attributed {
-                                    range: 10..11,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 13..14,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                2,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 16..17,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                3,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                            ctx: Load,
-                        },
-                    ),
+                    elts: [
+                        Constant(
+                            ExprConstant {
+                                range: 10..11,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 13..14,
+                                value: Int(
+                                    2,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 16..17,
+                                value: Int(
+                                    3,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    ctx: Load,
                 },
-                body: [
-                    Attributed {
+            ),
+            body: [
+                Pass(
+                    StmtPass {
                         range: 20..24,
-                        custom: (),
-                        node: Pass,
                     },
-                ],
-                orelse: [],
-                type_comment: None,
-            },
-        ),
-    },
+                ),
+            ],
+            orelse: [],
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap

@@ -3,97 +3,73 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..18,
-        custom: (),
-        node: Assign(
-            StmtAssign {
-                targets: [
-                    Attributed {
+    Assign(
+        StmtAssign {
+            range: 0..18,
+            targets: [
+                List(
+                    ExprList {
                         range: 0..6,
-                        custom: (),
-                        node: List(
-                            ExprList {
-                                elts: [
-                                    Attributed {
-                                        range: 1..2,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "x",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                    Attributed {
-                                        range: 4..5,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "y",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                ],
-                                ctx: Store,
+                        elts: [
+                            Name(
+                                ExprName {
+                                    range: 1..2,
+                                    id: Identifier(
+                                        "x",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                            Name(
+                                ExprName {
+                                    range: 4..5,
+                                    id: Identifier(
+                                        "y",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                        ],
+                        ctx: Store,
+                    },
+                ),
+            ],
+            value: Tuple(
+                ExprTuple {
+                    range: 9..18,
+                    elts: [
+                        Constant(
+                            ExprConstant {
+                                range: 10..11,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
                             },
                         ),
-                    },
-                ],
-                value: Attributed {
-                    range: 9..18,
-                    custom: (),
-                    node: Tuple(
-                        ExprTuple {
-                            elts: [
-                                Attributed {
-                                    range: 10..11,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 13..14,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                2,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 16..17,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                3,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                            ctx: Load,
-                        },
-                    ),
+                        Constant(
+                            ExprConstant {
+                                range: 13..14,
+                                value: Int(
+                                    2,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 16..17,
+                                value: Int(
+                                    3,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    ctx: Load,
                 },
-                type_comment: None,
-            },
-        ),
-    },
+            ),
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap

@@ -3,112 +3,86 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..26,
-        custom: (),
-        node: Assign(
-            StmtAssign {
-                targets: [
-                    Attributed {
+    Assign(
+        StmtAssign {
+            range: 0..26,
+            targets: [
+                Name(
+                    ExprName {
                         range: 0..1,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "x",
-                                ),
-                                ctx: Store,
-                            },
+                        id: Identifier(
+                            "x",
                         ),
+                        ctx: Store,
                     },
-                ],
-                value: Attributed {
+                ),
+            ],
+            value: ListComp(
+                ExprListComp {
                     range: 4..26,
-                    custom: (),
-                    node: ListComp(
-                        ExprListComp {
-                            elt: Attributed {
-                                range: 5..6,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "y",
-                                        ),
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
-                            generators: [
-                                Comprehension {
-                                    target: Attributed {
-                                        range: 11..12,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "y",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                    iter: Attributed {
-                                        range: 16..25,
-                                        custom: (),
-                                        node: Tuple(
-                                            ExprTuple {
-                                                elts: [
-                                                    Attributed {
-                                                        range: 17..18,
-                                                        custom: (),
-                                                        node: Constant(
-                                                            ExprConstant {
-                                                                value: Int(
-                                                                    1,
-                                                                ),
-                                                                kind: None,
-                                                            },
-                                                        ),
-                                                    },
-                                                    Attributed {
-                                                        range: 20..21,
-                                                        custom: (),
-                                                        node: Constant(
-                                                            ExprConstant {
-                                                                value: Int(
-                                                                    2,
-                                                                ),
-                                                                kind: None,
-                                                            },
-                                                        ),
-                                                    },
-                                                    Attributed {
-                                                        range: 23..24,
-                                                        custom: (),
-                                                        node: Constant(
-                                                            ExprConstant {
-                                                                value: Int(
-                                                                    3,
-                                                                ),
-                                                                kind: None,
-                                                            },
-                                                        ),
-                                                    },
-                                                ],
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    },
-                                    ifs: [],
-                                    is_async: false,
-                                },
-                            ],
+                    elt: Name(
+                        ExprName {
+                            range: 5..6,
+                            id: Identifier(
+                                "y",
+                            ),
+                            ctx: Load,
                         },
                     ),
+                    generators: [
+                        Comprehension {
+                            target: Name(
+                                ExprName {
+                                    range: 11..12,
+                                    id: Identifier(
+                                        "y",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                            iter: Tuple(
+                                ExprTuple {
+                                    range: 16..25,
+                                    elts: [
+                                        Constant(
+                                            ExprConstant {
+                                                range: 17..18,
+                                                value: Int(
+                                                    1,
+                                                ),
+                                                kind: None,
+                                            },
+                                        ),
+                                        Constant(
+                                            ExprConstant {
+                                                range: 20..21,
+                                                value: Int(
+                                                    2,
+                                                ),
+                                                kind: None,
+                                            },
+                                        ),
+                                        Constant(
+                                            ExprConstant {
+                                                range: 23..24,
+                                                value: Int(
+                                                    3,
+                                                ),
+                                                kind: None,
+                                            },
+                                        ),
+                                    ],
+                                    ctx: Load,
+                                },
+                            ),
+                            ifs: [],
+                            is_async: false,
+                            range: (),
+                        },
+                    ],
                 },
-                type_comment: None,
-            },
-        ),
-    },
+            ),
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap

@@ -3,74 +3,56 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..13,
-        custom: (),
-        node: Assign(
-            StmtAssign {
-                targets: [
-                    Attributed {
+    Assign(
+        StmtAssign {
+            range: 0..13,
+            targets: [
+                Name(
+                    ExprName {
                         range: 0..1,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "x",
+                        id: Identifier(
+                            "x",
+                        ),
+                        ctx: Store,
+                    },
+                ),
+            ],
+            value: Tuple(
+                ExprTuple {
+                    range: 4..13,
+                    elts: [
+                        Constant(
+                            ExprConstant {
+                                range: 5..6,
+                                value: Int(
+                                    1,
                                 ),
-                                ctx: Store,
+                                kind: None,
                             },
                         ),
-                    },
-                ],
-                value: Attributed {
-                    range: 4..13,
-                    custom: (),
-                    node: Tuple(
-                        ExprTuple {
-                            elts: [
-                                Attributed {
-                                    range: 5..6,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 8..9,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                2,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 11..12,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                3,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                            ctx: Load,
-                        },
-                    ),
+                        Constant(
+                            ExprConstant {
+                                range: 8..9,
+                                value: Int(
+                                    2,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 11..12,
+                                value: Int(
+                                    3,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    ctx: Load,
                 },
-                type_comment: None,
-            },
-        ),
-    },
+            ),
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__assign_named_expr.snap

@@ -3,52 +3,40 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..14,
-        custom: (),
-        node: If(
-            StmtIf {
-                test: Attributed {
+    If(
+        StmtIf {
+            range: 0..14,
+            test: NamedExpr(
+                ExprNamedExpr {
                     range: 3..8,
-                    custom: (),
-                    node: NamedExpr(
-                        ExprNamedExpr {
-                            target: Attributed {
-                                range: 3..4,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "x",
-                                        ),
-                                        ctx: Store,
-                                    },
-                                ),
-                            },
-                            value: Attributed {
-                                range: 7..8,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            1,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
+                    target: Name(
+                        ExprName {
+                            range: 3..4,
+                            id: Identifier(
+                                "x",
+                            ),
+                            ctx: Store,
+                        },
+                    ),
+                    value: Constant(
+                        ExprConstant {
+                            range: 7..8,
+                            value: Int(
+                                1,
+                            ),
+                            kind: None,
                         },
                     ),
                 },
-                body: [
-                    Attributed {
+            ),
+            body: [
+                Pass(
+                    StmtPass {
                         range: 10..14,
-                        custom: (),
-                        node: Pass,
                     },
-                ],
-                orelse: [],
-            },
-        ),
-    },
+                ),
+            ],
+            orelse: [],
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap

@@ -3,112 +3,86 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..26,
-        custom: (),
-        node: Assign(
-            StmtAssign {
-                targets: [
-                    Attributed {
+    Assign(
+        StmtAssign {
+            range: 0..26,
+            targets: [
+                Name(
+                    ExprName {
                         range: 0..1,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "x",
-                                ),
-                                ctx: Store,
-                            },
+                        id: Identifier(
+                            "x",
                         ),
+                        ctx: Store,
                     },
-                ],
-                value: Attributed {
+                ),
+            ],
+            value: SetComp(
+                ExprSetComp {
                     range: 4..26,
-                    custom: (),
-                    node: SetComp(
-                        ExprSetComp {
-                            elt: Attributed {
-                                range: 5..6,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "y",
-                                        ),
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
-                            generators: [
-                                Comprehension {
-                                    target: Attributed {
-                                        range: 11..12,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "y",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                    iter: Attributed {
-                                        range: 16..25,
-                                        custom: (),
-                                        node: Tuple(
-                                            ExprTuple {
-                                                elts: [
-                                                    Attributed {
-                                                        range: 17..18,
-                                                        custom: (),
-                                                        node: Constant(
-                                                            ExprConstant {
-                                                                value: Int(
-                                                                    1,
-                                                                ),
-                                                                kind: None,
-                                                            },
-                                                        ),
-                                                    },
-                                                    Attributed {
-                                                        range: 20..21,
-                                                        custom: (),
-                                                        node: Constant(
-                                                            ExprConstant {
-                                                                value: Int(
-                                                                    2,
-                                                                ),
-                                                                kind: None,
-                                                            },
-                                                        ),
-                                                    },
-                                                    Attributed {
-                                                        range: 23..24,
-                                                        custom: (),
-                                                        node: Constant(
-                                                            ExprConstant {
-                                                                value: Int(
-                                                                    3,
-                                                                ),
-                                                                kind: None,
-                                                            },
-                                                        ),
-                                                    },
-                                                ],
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    },
-                                    ifs: [],
-                                    is_async: false,
-                                },
-                            ],
+                    elt: Name(
+                        ExprName {
+                            range: 5..6,
+                            id: Identifier(
+                                "y",
+                            ),
+                            ctx: Load,
                         },
                     ),
+                    generators: [
+                        Comprehension {
+                            target: Name(
+                                ExprName {
+                                    range: 11..12,
+                                    id: Identifier(
+                                        "y",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                            iter: Tuple(
+                                ExprTuple {
+                                    range: 16..25,
+                                    elts: [
+                                        Constant(
+                                            ExprConstant {
+                                                range: 17..18,
+                                                value: Int(
+                                                    1,
+                                                ),
+                                                kind: None,
+                                            },
+                                        ),
+                                        Constant(
+                                            ExprConstant {
+                                                range: 20..21,
+                                                value: Int(
+                                                    2,
+                                                ),
+                                                kind: None,
+                                            },
+                                        ),
+                                        Constant(
+                                            ExprConstant {
+                                                range: 23..24,
+                                                value: Int(
+                                                    3,
+                                                ),
+                                                kind: None,
+                                            },
+                                        ),
+                                    ],
+                                    ctx: Load,
+                                },
+                            ),
+                            ifs: [],
+                            is_async: false,
+                            range: (),
+                        },
+                    ],
                 },
-                type_comment: None,
-            },
-        ),
-    },
+            ),
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap

@@ -3,106 +3,79 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..19,
-        custom: (),
-        node: Assign(
-            StmtAssign {
-                targets: [
-                    Attributed {
+    Assign(
+        StmtAssign {
+            range: 0..19,
+            targets: [
+                Tuple(
+                    ExprTuple {
                         range: 0..7,
-                        custom: (),
-                        node: Tuple(
-                            ExprTuple {
-                                elts: [
-                                    Attributed {
-                                        range: 1..2,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "x",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                    Attributed {
-                                        range: 4..6,
-                                        custom: (),
-                                        node: Starred(
-                                            ExprStarred {
-                                                value: Attributed {
-                                                    range: 5..6,
-                                                    custom: (),
-                                                    node: Name(
-                                                        ExprName {
-                                                            id: Identifier(
-                                                                "y",
-                                                            ),
-                                                            ctx: Store,
-                                                        },
-                                                    ),
-                                                },
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                ],
-                                ctx: Store,
+                        elts: [
+                            Name(
+                                ExprName {
+                                    range: 1..2,
+                                    id: Identifier(
+                                        "x",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                            Starred(
+                                ExprStarred {
+                                    range: 4..6,
+                                    value: Name(
+                                        ExprName {
+                                            range: 5..6,
+                                            id: Identifier(
+                                                "y",
+                                            ),
+                                            ctx: Store,
+                                        },
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                        ],
+                        ctx: Store,
+                    },
+                ),
+            ],
+            value: Tuple(
+                ExprTuple {
+                    range: 10..19,
+                    elts: [
+                        Constant(
+                            ExprConstant {
+                                range: 11..12,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
                             },
                         ),
-                    },
-                ],
-                value: Attributed {
-                    range: 10..19,
-                    custom: (),
-                    node: Tuple(
-                        ExprTuple {
-                            elts: [
-                                Attributed {
-                                    range: 11..12,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 14..15,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                2,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 17..18,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                3,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                            ctx: Load,
-                        },
-                    ),
+                        Constant(
+                            ExprConstant {
+                                range: 14..15,
+                                value: Int(
+                                    2,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 17..18,
+                                value: Int(
+                                    3,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    ctx: Load,
                 },
-                type_comment: None,
-            },
-        ),
-    },
+            ),
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap

@@ -3,95 +3,71 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..16,
-        custom: (),
-        node: Assign(
-            StmtAssign {
-                targets: [
-                    Attributed {
+    Assign(
+        StmtAssign {
+            range: 0..16,
+            targets: [
+                Subscript(
+                    ExprSubscript {
                         range: 0..4,
-                        custom: (),
-                        node: Subscript(
-                            ExprSubscript {
-                                value: Attributed {
-                                    range: 0..1,
-                                    custom: (),
-                                    node: Name(
-                                        ExprName {
-                                            id: Identifier(
-                                                "x",
-                                            ),
-                                            ctx: Load,
-                                        },
-                                    ),
-                                },
-                                slice: Attributed {
-                                    range: 2..3,
-                                    custom: (),
-                                    node: Name(
-                                        ExprName {
-                                            id: Identifier(
-                                                "y",
-                                            ),
-                                            ctx: Load,
-                                        },
-                                    ),
-                                },
-                                ctx: Store,
+                        value: Name(
+                            ExprName {
+                                range: 0..1,
+                                id: Identifier(
+                                    "x",
+                                ),
+                                ctx: Load,
                             },
                         ),
+                        slice: Name(
+                            ExprName {
+                                range: 2..3,
+                                id: Identifier(
+                                    "y",
+                                ),
+                                ctx: Load,
+                            },
+                        ),
+                        ctx: Store,
                     },
-                ],
-                value: Attributed {
+                ),
+            ],
+            value: Tuple(
+                ExprTuple {
                     range: 7..16,
-                    custom: (),
-                    node: Tuple(
-                        ExprTuple {
-                            elts: [
-                                Attributed {
-                                    range: 8..9,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 11..12,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                2,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 14..15,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                3,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                            ctx: Load,
-                        },
-                    ),
+                    elts: [
+                        Constant(
+                            ExprConstant {
+                                range: 8..9,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 11..12,
+                                value: Int(
+                                    2,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 14..15,
+                                value: Int(
+                                    3,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    ctx: Load,
                 },
-                type_comment: None,
-            },
-        ),
-    },
+            ),
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap

@@ -3,97 +3,73 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..18,
-        custom: (),
-        node: Assign(
-            StmtAssign {
-                targets: [
-                    Attributed {
+    Assign(
+        StmtAssign {
+            range: 0..18,
+            targets: [
+                Tuple(
+                    ExprTuple {
                         range: 0..6,
-                        custom: (),
-                        node: Tuple(
-                            ExprTuple {
-                                elts: [
-                                    Attributed {
-                                        range: 1..2,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "x",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                    Attributed {
-                                        range: 4..5,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "y",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                ],
-                                ctx: Store,
+                        elts: [
+                            Name(
+                                ExprName {
+                                    range: 1..2,
+                                    id: Identifier(
+                                        "x",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                            Name(
+                                ExprName {
+                                    range: 4..5,
+                                    id: Identifier(
+                                        "y",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                        ],
+                        ctx: Store,
+                    },
+                ),
+            ],
+            value: Tuple(
+                ExprTuple {
+                    range: 9..18,
+                    elts: [
+                        Constant(
+                            ExprConstant {
+                                range: 10..11,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
                             },
                         ),
-                    },
-                ],
-                value: Attributed {
-                    range: 9..18,
-                    custom: (),
-                    node: Tuple(
-                        ExprTuple {
-                            elts: [
-                                Attributed {
-                                    range: 10..11,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 13..14,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                2,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 16..17,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                3,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                            ctx: Load,
-                        },
-                    ),
+                        Constant(
+                            ExprConstant {
+                                range: 13..14,
+                                value: Int(
+                                    2,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 16..17,
+                                value: Int(
+                                    3,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    ctx: Load,
                 },
-                type_comment: None,
-            },
-        ),
-    },
+            ),
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__assign_with.snap

@@ -3,50 +3,42 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..17,
-        custom: (),
-        node: With(
-            StmtWith {
-                items: [
-                    Withitem {
-                        context_expr: Attributed {
+    With(
+        StmtWith {
+            range: 0..17,
+            items: [
+                Withitem {
+                    context_expr: Constant(
+                        ExprConstant {
                             range: 5..6,
-                            custom: (),
-                            node: Constant(
-                                ExprConstant {
-                                    value: Int(
-                                        1,
-                                    ),
-                                    kind: None,
-                                },
+                            value: Int(
+                                1,
                             ),
+                            kind: None,
                         },
-                        optional_vars: Some(
-                            Attributed {
+                    ),
+                    optional_vars: Some(
+                        Name(
+                            ExprName {
                                 range: 10..11,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "x",
-                                        ),
-                                        ctx: Store,
-                                    },
+                                id: Identifier(
+                                    "x",
                                 ),
+                                ctx: Store,
                             },
                         ),
-                    },
-                ],
-                body: [
-                    Attributed {
+                    ),
+                    range: (),
+                },
+            ],
+            body: [
+                Pass(
+                    StmtPass {
                         range: 13..17,
-                        custom: (),
-                        node: Pass,
                     },
-                ],
-                type_comment: None,
-            },
-        ),
-    },
+                ),
+            ],
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap

@@ -3,84 +3,63 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..16,
-        custom: (),
-        node: AugAssign(
-            StmtAugAssign {
-                target: Attributed {
+    AugAssign(
+        StmtAugAssign {
+            range: 0..16,
+            target: Attribute(
+                ExprAttribute {
                     range: 0..3,
-                    custom: (),
-                    node: Attribute(
-                        ExprAttribute {
-                            value: Attributed {
-                                range: 0..1,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "x",
-                                        ),
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
-                            attr: Identifier(
-                                "y",
+                    value: Name(
+                        ExprName {
+                            range: 0..1,
+                            id: Identifier(
+                                "x",
                             ),
-                            ctx: Store,
-                        },
-                    ),
-                },
-                op: Add,
-                value: Attributed {
-                    range: 7..16,
-                    custom: (),
-                    node: Tuple(
-                        ExprTuple {
-                            elts: [
-                                Attributed {
-                                    range: 8..9,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 11..12,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                2,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 14..15,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                3,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
                             ctx: Load,
                         },
                     ),
+                    attr: Identifier(
+                        "y",
+                    ),
+                    ctx: Store,
                 },
-            },
-        ),
-    },
+            ),
+            op: Add,
+            value: Tuple(
+                ExprTuple {
+                    range: 7..16,
+                    elts: [
+                        Constant(
+                            ExprConstant {
+                                range: 8..9,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 11..12,
+                                value: Int(
+                                    2,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 14..15,
+                                value: Int(
+                                    3,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    ctx: Load,
+                },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__aug_assign_name.snap

@@ -3,37 +3,28 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..6,
-        custom: (),
-        node: AugAssign(
-            StmtAugAssign {
-                target: Attributed {
+    AugAssign(
+        StmtAugAssign {
+            range: 0..6,
+            target: Name(
+                ExprName {
                     range: 0..1,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "x",
-                            ),
-                            ctx: Store,
-                        },
+                    id: Identifier(
+                        "x",
                     ),
+                    ctx: Store,
                 },
-                op: Add,
-                value: Attributed {
+            ),
+            op: Add,
+            value: Constant(
+                ExprConstant {
                     range: 5..6,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Int(
-                                1,
-                            ),
-                            kind: None,
-                        },
+                    value: Int(
+                        1,
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap

@@ -3,93 +3,69 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..17,
-        custom: (),
-        node: AugAssign(
-            StmtAugAssign {
-                target: Attributed {
+    AugAssign(
+        StmtAugAssign {
+            range: 0..17,
+            target: Subscript(
+                ExprSubscript {
                     range: 0..4,
-                    custom: (),
-                    node: Subscript(
-                        ExprSubscript {
-                            value: Attributed {
-                                range: 0..1,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "x",
-                                        ),
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
-                            slice: Attributed {
-                                range: 2..3,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "y",
-                                        ),
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
-                            ctx: Store,
-                        },
-                    ),
-                },
-                op: Add,
-                value: Attributed {
-                    range: 8..17,
-                    custom: (),
-                    node: Tuple(
-                        ExprTuple {
-                            elts: [
-                                Attributed {
-                                    range: 9..10,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 12..13,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                2,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 15..16,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                3,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
+                    value: Name(
+                        ExprName {
+                            range: 0..1,
+                            id: Identifier(
+                                "x",
+                            ),
                             ctx: Load,
                         },
                     ),
+                    slice: Name(
+                        ExprName {
+                            range: 2..3,
+                            id: Identifier(
+                                "y",
+                            ),
+                            ctx: Load,
+                        },
+                    ),
+                    ctx: Store,
                 },
-            },
-        ),
-    },
+            ),
+            op: Add,
+            value: Tuple(
+                ExprTuple {
+                    range: 8..17,
+                    elts: [
+                        Constant(
+                            ExprConstant {
+                                range: 9..10,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 12..13,
+                                value: Int(
+                                    2,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 15..16,
+                                value: Int(
+                                    3,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    ctx: Load,
+                },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__del_attribute.snap

@@ -3,38 +3,29 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..7,
-        custom: (),
-        node: Delete(
-            StmtDelete {
-                targets: [
-                    Attributed {
+    Delete(
+        StmtDelete {
+            range: 0..7,
+            targets: [
+                Attribute(
+                    ExprAttribute {
                         range: 4..7,
-                        custom: (),
-                        node: Attribute(
-                            ExprAttribute {
-                                value: Attributed {
-                                    range: 4..5,
-                                    custom: (),
-                                    node: Name(
-                                        ExprName {
-                                            id: Identifier(
-                                                "x",
-                                            ),
-                                            ctx: Load,
-                                        },
-                                    ),
-                                },
-                                attr: Identifier(
-                                    "y",
+                        value: Name(
+                            ExprName {
+                                range: 4..5,
+                                id: Identifier(
+                                    "x",
                                 ),
-                                ctx: Del,
+                                ctx: Load,
                             },
                         ),
+                        attr: Identifier(
+                            "y",
+                        ),
+                        ctx: Del,
                     },
-                ],
-            },
-        ),
-    },
+                ),
+            ],
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__del_name.snap

@@ -3,26 +3,20 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..5,
-        custom: (),
-        node: Delete(
-            StmtDelete {
-                targets: [
-                    Attributed {
+    Delete(
+        StmtDelete {
+            range: 0..5,
+            targets: [
+                Name(
+                    ExprName {
                         range: 4..5,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "x",
-                                ),
-                                ctx: Del,
-                            },
+                        id: Identifier(
+                            "x",
                         ),
+                        ctx: Del,
                     },
-                ],
-            },
-        ),
-    },
+                ),
+            ],
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__context__tests__del_subscript.snap

@@ -3,47 +3,35 @@ source: parser/src/context.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..8,
-        custom: (),
-        node: Delete(
-            StmtDelete {
-                targets: [
-                    Attributed {
+    Delete(
+        StmtDelete {
+            range: 0..8,
+            targets: [
+                Subscript(
+                    ExprSubscript {
                         range: 4..8,
-                        custom: (),
-                        node: Subscript(
-                            ExprSubscript {
-                                value: Attributed {
-                                    range: 4..5,
-                                    custom: (),
-                                    node: Name(
-                                        ExprName {
-                                            id: Identifier(
-                                                "x",
-                                            ),
-                                            ctx: Load,
-                                        },
-                                    ),
-                                },
-                                slice: Attributed {
-                                    range: 6..7,
-                                    custom: (),
-                                    node: Name(
-                                        ExprName {
-                                            id: Identifier(
-                                                "y",
-                                            ),
-                                            ctx: Load,
-                                        },
-                                    ),
-                                },
-                                ctx: Del,
+                        value: Name(
+                            ExprName {
+                                range: 4..5,
+                                id: Identifier(
+                                    "x",
+                                ),
+                                ctx: Load,
                             },
                         ),
+                        slice: Name(
+                            ExprName {
+                                range: 6..7,
+                                id: Identifier(
+                                    "y",
+                                ),
+                                ctx: Load,
+                            },
+                        ),
+                        ctx: Del,
                     },
-                ],
-            },
-        ),
-    },
+                ),
+            ],
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args.snap

@@ -4,69 +4,58 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..23,
-            custom: (),
-            node: FunctionDef(
-                StmtFunctionDef {
-                    name: Identifier(
-                        "f",
-                    ),
-                    args: Arguments {
-                        posonlyargs: [],
-                        args: [],
-                        vararg: None,
-                        kwonlyargs: [
-                            Attributed {
-                                range: 9..10,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "a",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 12..13,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "b",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 15..16,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "c",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        kw_defaults: [],
-                        kwarg: None,
-                        defaults: [],
-                    },
-                    body: [
-                        Attributed {
-                            range: 19..23,
-                            custom: (),
-                            node: Pass,
+        FunctionDef(
+            StmtFunctionDef {
+                range: 0..23,
+                name: Identifier(
+                    "f",
+                ),
+                args: Arguments {
+                    posonlyargs: [],
+                    args: [],
+                    vararg: None,
+                    kwonlyargs: [
+                        Arg {
+                            arg: Identifier(
+                                "a",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 9..10,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "b",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 12..13,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "c",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 15..16,
                         },
                     ],
-                    decorator_list: [],
-                    returns: None,
-                    type_comment: None,
+                    kw_defaults: [],
+                    kwarg: None,
+                    defaults: [],
+                    range: (),
                 },
-            ),
-        },
+                body: [
+                    Pass(
+                        StmtPass {
+                            range: 19..23,
+                        },
+                    ),
+                ],
+                decorator_list: [],
+                returns: None,
+                type_comment: None,
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap

@@ -4,94 +4,77 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..29,
-            custom: (),
-            node: FunctionDef(
-                StmtFunctionDef {
-                    name: Identifier(
-                        "f",
-                    ),
-                    args: Arguments {
-                        posonlyargs: [],
-                        args: [],
-                        vararg: None,
-                        kwonlyargs: [
-                            Attributed {
-                                range: 9..10,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "a",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 12..13,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "b",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 18..19,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "c",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        kw_defaults: [
-                            Attributed {
-                                range: 14..16,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            20,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                            Attributed {
-                                range: 20..22,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            30,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                        ],
-                        kwarg: None,
-                        defaults: [],
-                    },
-                    body: [
-                        Attributed {
-                            range: 25..29,
-                            custom: (),
-                            node: Pass,
+        FunctionDef(
+            StmtFunctionDef {
+                range: 0..29,
+                name: Identifier(
+                    "f",
+                ),
+                args: Arguments {
+                    posonlyargs: [],
+                    args: [],
+                    vararg: None,
+                    kwonlyargs: [
+                        Arg {
+                            arg: Identifier(
+                                "a",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 9..10,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "b",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 12..13,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "c",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 18..19,
                         },
                     ],
-                    decorator_list: [],
-                    returns: None,
-                    type_comment: None,
+                    kw_defaults: [
+                        Constant(
+                            ExprConstant {
+                                range: 14..16,
+                                value: Int(
+                                    20,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 20..22,
+                                value: Int(
+                                    30,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    kwarg: None,
+                    defaults: [],
+                    range: (),
                 },
-            ),
-        },
+                body: [
+                    Pass(
+                        StmtPass {
+                            range: 25..29,
+                        },
+                    ),
+                ],
+                decorator_list: [],
+                returns: None,
+                type_comment: None,
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__function_no_args.snap

@@ -4,35 +4,33 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..13,
-            custom: (),
-            node: FunctionDef(
-                StmtFunctionDef {
-                    name: Identifier(
-                        "f",
-                    ),
-                    args: Arguments {
-                        posonlyargs: [],
-                        args: [],
-                        vararg: None,
-                        kwonlyargs: [],
-                        kw_defaults: [],
-                        kwarg: None,
-                        defaults: [],
-                    },
-                    body: [
-                        Attributed {
-                            range: 9..13,
-                            custom: (),
-                            node: Pass,
-                        },
-                    ],
-                    decorator_list: [],
-                    returns: None,
-                    type_comment: None,
+        FunctionDef(
+            StmtFunctionDef {
+                range: 0..13,
+                name: Identifier(
+                    "f",
+                ),
+                args: Arguments {
+                    posonlyargs: [],
+                    args: [],
+                    vararg: None,
+                    kwonlyargs: [],
+                    kw_defaults: [],
+                    kwarg: None,
+                    defaults: [],
+                    range: (),
                 },
-            ),
-        },
+                body: [
+                    Pass(
+                        StmtPass {
+                            range: 9..13,
+                        },
+                    ),
+                ],
+                decorator_list: [],
+                returns: None,
+                type_comment: None,
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args.snap

@@ -4,103 +4,83 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..32,
-            custom: (),
-            node: FunctionDef(
-                StmtFunctionDef {
-                    name: Identifier(
-                        "f",
-                    ),
-                    args: Arguments {
-                        posonlyargs: [],
-                        args: [
-                            Attributed {
-                                range: 6..7,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "a",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 9..10,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "b",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 12..13,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "c",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        vararg: None,
-                        kwonlyargs: [
-                            Attributed {
-                                range: 18..19,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "d",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 21..22,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "e",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 24..25,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "f",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        kw_defaults: [],
-                        kwarg: None,
-                        defaults: [],
-                    },
-                    body: [
-                        Attributed {
-                            range: 28..32,
-                            custom: (),
-                            node: Pass,
+        FunctionDef(
+            StmtFunctionDef {
+                range: 0..32,
+                name: Identifier(
+                    "f",
+                ),
+                args: Arguments {
+                    posonlyargs: [],
+                    args: [
+                        Arg {
+                            arg: Identifier(
+                                "a",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 6..7,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "b",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 9..10,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "c",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 12..13,
                         },
                     ],
-                    decorator_list: [],
-                    returns: None,
-                    type_comment: None,
+                    vararg: None,
+                    kwonlyargs: [
+                        Arg {
+                            arg: Identifier(
+                                "d",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 18..19,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "e",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 21..22,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "f",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 24..25,
+                        },
+                    ],
+                    kw_defaults: [],
+                    kwarg: None,
+                    defaults: [],
+                    range: (),
                 },
-            ),
-        },
+                body: [
+                    Pass(
+                        StmtPass {
+                            range: 28..32,
+                        },
+                    ),
+                ],
+                decorator_list: [],
+                returns: None,
+                type_comment: None,
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap

@@ -4,128 +4,102 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..38,
-            custom: (),
-            node: FunctionDef(
-                StmtFunctionDef {
-                    name: Identifier(
-                        "f",
-                    ),
-                    args: Arguments {
-                        posonlyargs: [],
-                        args: [
-                            Attributed {
-                                range: 6..7,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "a",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 9..10,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "b",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 12..13,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "c",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        vararg: None,
-                        kwonlyargs: [
-                            Attributed {
-                                range: 18..19,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "d",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 21..22,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "e",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 27..28,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "f",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        kw_defaults: [
-                            Attributed {
-                                range: 23..25,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            20,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                            Attributed {
-                                range: 29..31,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            30,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                        ],
-                        kwarg: None,
-                        defaults: [],
-                    },
-                    body: [
-                        Attributed {
-                            range: 34..38,
-                            custom: (),
-                            node: Pass,
+        FunctionDef(
+            StmtFunctionDef {
+                range: 0..38,
+                name: Identifier(
+                    "f",
+                ),
+                args: Arguments {
+                    posonlyargs: [],
+                    args: [
+                        Arg {
+                            arg: Identifier(
+                                "a",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 6..7,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "b",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 9..10,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "c",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 12..13,
                         },
                     ],
-                    decorator_list: [],
-                    returns: None,
-                    type_comment: None,
+                    vararg: None,
+                    kwonlyargs: [
+                        Arg {
+                            arg: Identifier(
+                                "d",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 18..19,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "e",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 21..22,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "f",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 27..28,
+                        },
+                    ],
+                    kw_defaults: [
+                        Constant(
+                            ExprConstant {
+                                range: 23..25,
+                                value: Int(
+                                    20,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 29..31,
+                                value: Int(
+                                    30,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    kwarg: None,
+                    defaults: [],
+                    range: (),
                 },
-            ),
-        },
+                body: [
+                    Pass(
+                        StmtPass {
+                            range: 34..38,
+                        },
+                    ),
+                ],
+                decorator_list: [],
+                returns: None,
+                type_comment: None,
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap

@@ -4,140 +4,111 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..42,
-            custom: (),
-            node: FunctionDef(
-                StmtFunctionDef {
-                    name: Identifier(
-                        "f",
-                    ),
-                    args: Arguments {
-                        posonlyargs: [],
-                        args: [
-                            Attributed {
-                                range: 6..7,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "a",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 9..10,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "b",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 12..13,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "c",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        vararg: Some(
-                            Attributed {
-                                range: 16..20,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "args",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ),
-                        kwonlyargs: [
-                            Attributed {
-                                range: 22..23,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "d",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 25..26,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "e",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 31..32,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "f",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        kw_defaults: [
-                            Attributed {
-                                range: 27..29,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            20,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                            Attributed {
-                                range: 33..35,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            30,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                        ],
-                        kwarg: None,
-                        defaults: [],
-                    },
-                    body: [
-                        Attributed {
-                            range: 38..42,
-                            custom: (),
-                            node: Pass,
+        FunctionDef(
+            StmtFunctionDef {
+                range: 0..42,
+                name: Identifier(
+                    "f",
+                ),
+                args: Arguments {
+                    posonlyargs: [],
+                    args: [
+                        Arg {
+                            arg: Identifier(
+                                "a",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 6..7,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "b",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 9..10,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "c",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 12..13,
                         },
                     ],
-                    decorator_list: [],
-                    returns: None,
-                    type_comment: None,
+                    vararg: Some(
+                        Arg {
+                            arg: Identifier(
+                                "args",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 16..20,
+                        },
+                    ),
+                    kwonlyargs: [
+                        Arg {
+                            arg: Identifier(
+                                "d",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 22..23,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "e",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 25..26,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "f",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 31..32,
+                        },
+                    ],
+                    kw_defaults: [
+                        Constant(
+                            ExprConstant {
+                                range: 27..29,
+                                value: Int(
+                                    20,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 33..35,
+                                value: Int(
+                                    30,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    kwarg: None,
+                    defaults: [],
+                    range: (),
                 },
-            ),
-        },
+                body: [
+                    Pass(
+                        StmtPass {
+                            range: 38..42,
+                        },
+                    ),
+                ],
+                decorator_list: [],
+                returns: None,
+                type_comment: None,
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap

@@ -4,152 +4,120 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..52,
-            custom: (),
-            node: FunctionDef(
-                StmtFunctionDef {
-                    name: Identifier(
-                        "f",
-                    ),
-                    args: Arguments {
-                        posonlyargs: [],
-                        args: [
-                            Attributed {
-                                range: 6..7,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "a",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 9..10,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "b",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 12..13,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "c",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        vararg: Some(
-                            Attributed {
-                                range: 16..20,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "args",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ),
-                        kwonlyargs: [
-                            Attributed {
-                                range: 22..23,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "d",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 25..26,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "e",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 31..32,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "f",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        kw_defaults: [
-                            Attributed {
-                                range: 27..29,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            20,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                            Attributed {
-                                range: 33..35,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            30,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                        ],
-                        kwarg: Some(
-                            Attributed {
-                                range: 39..45,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "kwargs",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ),
-                        defaults: [],
-                    },
-                    body: [
-                        Attributed {
-                            range: 48..52,
-                            custom: (),
-                            node: Pass,
+        FunctionDef(
+            StmtFunctionDef {
+                range: 0..52,
+                name: Identifier(
+                    "f",
+                ),
+                args: Arguments {
+                    posonlyargs: [],
+                    args: [
+                        Arg {
+                            arg: Identifier(
+                                "a",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 6..7,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "b",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 9..10,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "c",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 12..13,
                         },
                     ],
-                    decorator_list: [],
-                    returns: None,
-                    type_comment: None,
+                    vararg: Some(
+                        Arg {
+                            arg: Identifier(
+                                "args",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 16..20,
+                        },
+                    ),
+                    kwonlyargs: [
+                        Arg {
+                            arg: Identifier(
+                                "d",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 22..23,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "e",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 25..26,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "f",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 31..32,
+                        },
+                    ],
+                    kw_defaults: [
+                        Constant(
+                            ExprConstant {
+                                range: 27..29,
+                                value: Int(
+                                    20,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 33..35,
+                                value: Int(
+                                    30,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    kwarg: Some(
+                        Arg {
+                            arg: Identifier(
+                                "kwargs",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 39..45,
+                        },
+                    ),
+                    defaults: [],
+                    range: (),
                 },
-            ),
-        },
+                body: [
+                    Pass(
+                        StmtPass {
+                            range: 48..52,
+                        },
+                    ),
+                ],
+                decorator_list: [],
+                returns: None,
+                type_comment: None,
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__function_pos_args.snap

@@ -4,69 +4,58 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..20,
-            custom: (),
-            node: FunctionDef(
-                StmtFunctionDef {
-                    name: Identifier(
-                        "f",
-                    ),
-                    args: Arguments {
-                        posonlyargs: [],
-                        args: [
-                            Attributed {
-                                range: 6..7,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "a",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 9..10,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "b",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 12..13,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "c",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        vararg: None,
-                        kwonlyargs: [],
-                        kw_defaults: [],
-                        kwarg: None,
-                        defaults: [],
-                    },
-                    body: [
-                        Attributed {
-                            range: 16..20,
-                            custom: (),
-                            node: Pass,
+        FunctionDef(
+            StmtFunctionDef {
+                range: 0..20,
+                name: Identifier(
+                    "f",
+                ),
+                args: Arguments {
+                    posonlyargs: [],
+                    args: [
+                        Arg {
+                            arg: Identifier(
+                                "a",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 6..7,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "b",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 9..10,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "c",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 12..13,
                         },
                     ],
-                    decorator_list: [],
-                    returns: None,
-                    type_comment: None,
+                    vararg: None,
+                    kwonlyargs: [],
+                    kw_defaults: [],
+                    kwarg: None,
+                    defaults: [],
+                    range: (),
                 },
-            ),
-        },
+                body: [
+                    Pass(
+                        StmtPass {
+                            range: 16..20,
+                        },
+                    ),
+                ],
+                decorator_list: [],
+                returns: None,
+                type_comment: None,
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap

@@ -4,94 +4,77 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..26,
-            custom: (),
-            node: FunctionDef(
-                StmtFunctionDef {
-                    name: Identifier(
-                        "f",
-                    ),
-                    args: Arguments {
-                        posonlyargs: [],
-                        args: [
-                            Attributed {
-                                range: 6..7,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "a",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 9..10,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "b",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                            Attributed {
-                                range: 15..16,
-                                custom: (),
-                                node: ArgData {
-                                    arg: Identifier(
-                                        "c",
-                                    ),
-                                    annotation: None,
-                                    type_comment: None,
-                                },
-                            },
-                        ],
-                        vararg: None,
-                        kwonlyargs: [],
-                        kw_defaults: [],
-                        kwarg: None,
-                        defaults: [
-                            Attributed {
-                                range: 11..13,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            20,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                            Attributed {
-                                range: 17..19,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            30,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                        ],
-                    },
-                    body: [
-                        Attributed {
-                            range: 22..26,
-                            custom: (),
-                            node: Pass,
+        FunctionDef(
+            StmtFunctionDef {
+                range: 0..26,
+                name: Identifier(
+                    "f",
+                ),
+                args: Arguments {
+                    posonlyargs: [],
+                    args: [
+                        Arg {
+                            arg: Identifier(
+                                "a",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 6..7,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "b",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 9..10,
+                        },
+                        Arg {
+                            arg: Identifier(
+                                "c",
+                            ),
+                            annotation: None,
+                            type_comment: None,
+                            range: 15..16,
                         },
                     ],
-                    decorator_list: [],
-                    returns: None,
-                    type_comment: None,
+                    vararg: None,
+                    kwonlyargs: [],
+                    kw_defaults: [],
+                    kwarg: None,
+                    defaults: [
+                        Constant(
+                            ExprConstant {
+                                range: 11..13,
+                                value: Int(
+                                    20,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 17..19,
+                                value: Int(
+                                    30,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    range: (),
                 },
-            ),
-        },
+                body: [
+                    Pass(
+                        StmtPass {
+                            range: 22..26,
+                        },
+                    ),
+                ],
+                decorator_list: [],
+                returns: None,
+                type_comment: None,
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args.snap

@@ -4,76 +4,59 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..20,
-            custom: (),
-            node: Expr(
-                StmtExpr {
-                    value: Attributed {
+        Expr(
+            StmtExpr {
+                range: 0..20,
+                value: Lambda(
+                    ExprLambda {
                         range: 0..20,
-                        custom: (),
-                        node: Lambda(
-                            ExprLambda {
-                                args: Arguments {
-                                    posonlyargs: [],
-                                    args: [],
-                                    vararg: None,
-                                    kwonlyargs: [
-                                        Attributed {
-                                            range: 10..11,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "a",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 13..14,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "b",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 16..17,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "c",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                    ],
-                                    kw_defaults: [],
-                                    kwarg: None,
-                                    defaults: [],
-                                },
-                                body: Attributed {
-                                    range: 19..20,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
+                        args: Arguments {
+                            posonlyargs: [],
+                            args: [],
+                            vararg: None,
+                            kwonlyargs: [
+                                Arg {
+                                    arg: Identifier(
+                                        "a",
                                     ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 10..11,
                                 },
+                                Arg {
+                                    arg: Identifier(
+                                        "b",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 13..14,
+                                },
+                                Arg {
+                                    arg: Identifier(
+                                        "c",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 16..17,
+                                },
+                            ],
+                            kw_defaults: [],
+                            kwarg: None,
+                            defaults: [],
+                            range: (),
+                        },
+                        body: Constant(
+                            ExprConstant {
+                                range: 19..20,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
                             },
                         ),
                     },
-                },
-            ),
-        },
+                ),
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args_with_defaults.snap

@@ -4,101 +4,78 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..26,
-            custom: (),
-            node: Expr(
-                StmtExpr {
-                    value: Attributed {
+        Expr(
+            StmtExpr {
+                range: 0..26,
+                value: Lambda(
+                    ExprLambda {
                         range: 0..26,
-                        custom: (),
-                        node: Lambda(
-                            ExprLambda {
-                                args: Arguments {
-                                    posonlyargs: [],
-                                    args: [],
-                                    vararg: None,
-                                    kwonlyargs: [
-                                        Attributed {
-                                            range: 10..11,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "a",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 13..14,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "b",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 19..20,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "c",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                    ],
-                                    kw_defaults: [
-                                        Attributed {
-                                            range: 15..17,
-                                            custom: (),
-                                            node: Constant(
-                                                ExprConstant {
-                                                    value: Int(
-                                                        20,
-                                                    ),
-                                                    kind: None,
-                                                },
-                                            ),
-                                        },
-                                        Attributed {
-                                            range: 21..23,
-                                            custom: (),
-                                            node: Constant(
-                                                ExprConstant {
-                                                    value: Int(
-                                                        30,
-                                                    ),
-                                                    kind: None,
-                                                },
-                                            ),
-                                        },
-                                    ],
-                                    kwarg: None,
-                                    defaults: [],
-                                },
-                                body: Attributed {
-                                    range: 25..26,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
+                        args: Arguments {
+                            posonlyargs: [],
+                            args: [],
+                            vararg: None,
+                            kwonlyargs: [
+                                Arg {
+                                    arg: Identifier(
+                                        "a",
                                     ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 10..11,
                                 },
+                                Arg {
+                                    arg: Identifier(
+                                        "b",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 13..14,
+                                },
+                                Arg {
+                                    arg: Identifier(
+                                        "c",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 19..20,
+                                },
+                            ],
+                            kw_defaults: [
+                                Constant(
+                                    ExprConstant {
+                                        range: 15..17,
+                                        value: Int(
+                                            20,
+                                        ),
+                                        kind: None,
+                                    },
+                                ),
+                                Constant(
+                                    ExprConstant {
+                                        range: 21..23,
+                                        value: Int(
+                                            30,
+                                        ),
+                                        kind: None,
+                                    },
+                                ),
+                            ],
+                            kwarg: None,
+                            defaults: [],
+                            range: (),
+                        },
+                        body: Constant(
+                            ExprConstant {
+                                range: 25..26,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
                             },
                         ),
                     },
-                },
-            ),
-        },
+                ),
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__lambda_no_args.snap

@@ -4,42 +4,34 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..9,
-            custom: (),
-            node: Expr(
-                StmtExpr {
-                    value: Attributed {
+        Expr(
+            StmtExpr {
+                range: 0..9,
+                value: Lambda(
+                    ExprLambda {
                         range: 0..9,
-                        custom: (),
-                        node: Lambda(
-                            ExprLambda {
-                                args: Arguments {
-                                    posonlyargs: [],
-                                    args: [],
-                                    vararg: None,
-                                    kwonlyargs: [],
-                                    kw_defaults: [],
-                                    kwarg: None,
-                                    defaults: [],
-                                },
-                                body: Attributed {
-                                    range: 8..9,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
+                        args: Arguments {
+                            posonlyargs: [],
+                            args: [],
+                            vararg: None,
+                            kwonlyargs: [],
+                            kw_defaults: [],
+                            kwarg: None,
+                            defaults: [],
+                            range: (),
+                        },
+                        body: Constant(
+                            ExprConstant {
+                                range: 8..9,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
                             },
                         ),
                     },
-                },
-            ),
-        },
+                ),
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_and_kw_only_args.snap

@@ -4,99 +4,76 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..26,
-            custom: (),
-            node: Expr(
-                StmtExpr {
-                    value: Attributed {
+        Expr(
+            StmtExpr {
+                range: 0..26,
+                value: Lambda(
+                    ExprLambda {
                         range: 0..26,
-                        custom: (),
-                        node: Lambda(
-                            ExprLambda {
-                                args: Arguments {
-                                    posonlyargs: [],
-                                    args: [
-                                        Attributed {
-                                            range: 7..8,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "a",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 10..11,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "b",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 13..14,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "c",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                    ],
-                                    vararg: None,
-                                    kwonlyargs: [
-                                        Attributed {
-                                            range: 19..20,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "d",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 22..23,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "e",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                    ],
-                                    kw_defaults: [],
-                                    kwarg: None,
-                                    defaults: [],
-                                },
-                                body: Attributed {
-                                    range: 25..26,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                0,
-                                            ),
-                                            kind: None,
-                                        },
+                        args: Arguments {
+                            posonlyargs: [],
+                            args: [
+                                Arg {
+                                    arg: Identifier(
+                                        "a",
                                     ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 7..8,
                                 },
+                                Arg {
+                                    arg: Identifier(
+                                        "b",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 10..11,
+                                },
+                                Arg {
+                                    arg: Identifier(
+                                        "c",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 13..14,
+                                },
+                            ],
+                            vararg: None,
+                            kwonlyargs: [
+                                Arg {
+                                    arg: Identifier(
+                                        "d",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 19..20,
+                                },
+                                Arg {
+                                    arg: Identifier(
+                                        "e",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 22..23,
+                                },
+                            ],
+                            kw_defaults: [],
+                            kwarg: None,
+                            defaults: [],
+                            range: (),
+                        },
+                        body: Constant(
+                            ExprConstant {
+                                range: 25..26,
+                                value: Int(
+                                    0,
+                                ),
+                                kind: None,
                             },
                         ),
                     },
-                },
-            ),
-        },
+                ),
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args.snap

@@ -4,76 +4,59 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..17,
-            custom: (),
-            node: Expr(
-                StmtExpr {
-                    value: Attributed {
+        Expr(
+            StmtExpr {
+                range: 0..17,
+                value: Lambda(
+                    ExprLambda {
                         range: 0..17,
-                        custom: (),
-                        node: Lambda(
-                            ExprLambda {
-                                args: Arguments {
-                                    posonlyargs: [],
-                                    args: [
-                                        Attributed {
-                                            range: 7..8,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "a",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 10..11,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "b",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 13..14,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "c",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                    ],
-                                    vararg: None,
-                                    kwonlyargs: [],
-                                    kw_defaults: [],
-                                    kwarg: None,
-                                    defaults: [],
-                                },
-                                body: Attributed {
-                                    range: 16..17,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
+                        args: Arguments {
+                            posonlyargs: [],
+                            args: [
+                                Arg {
+                                    arg: Identifier(
+                                        "a",
                                     ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 7..8,
                                 },
+                                Arg {
+                                    arg: Identifier(
+                                        "b",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 10..11,
+                                },
+                                Arg {
+                                    arg: Identifier(
+                                        "c",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 13..14,
+                                },
+                            ],
+                            vararg: None,
+                            kwonlyargs: [],
+                            kw_defaults: [],
+                            kwarg: None,
+                            defaults: [],
+                            range: (),
+                        },
+                        body: Constant(
+                            ExprConstant {
+                                range: 16..17,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
                             },
                         ),
                     },
-                },
-            ),
-        },
+                ),
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args_with_defaults.snap

@@ -4,101 +4,78 @@ expression: parse_ast
 ---
 Ok(
     [
-        Attributed {
-            range: 0..23,
-            custom: (),
-            node: Expr(
-                StmtExpr {
-                    value: Attributed {
+        Expr(
+            StmtExpr {
+                range: 0..23,
+                value: Lambda(
+                    ExprLambda {
                         range: 0..23,
-                        custom: (),
-                        node: Lambda(
-                            ExprLambda {
-                                args: Arguments {
-                                    posonlyargs: [],
-                                    args: [
-                                        Attributed {
-                                            range: 7..8,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "a",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 10..11,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "b",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 16..17,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "c",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                    ],
-                                    vararg: None,
-                                    kwonlyargs: [],
-                                    kw_defaults: [],
-                                    kwarg: None,
-                                    defaults: [
-                                        Attributed {
-                                            range: 12..14,
-                                            custom: (),
-                                            node: Constant(
-                                                ExprConstant {
-                                                    value: Int(
-                                                        20,
-                                                    ),
-                                                    kind: None,
-                                                },
-                                            ),
-                                        },
-                                        Attributed {
-                                            range: 18..20,
-                                            custom: (),
-                                            node: Constant(
-                                                ExprConstant {
-                                                    value: Int(
-                                                        30,
-                                                    ),
-                                                    kind: None,
-                                                },
-                                            ),
-                                        },
-                                    ],
-                                },
-                                body: Attributed {
-                                    range: 22..23,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                1,
-                                            ),
-                                            kind: None,
-                                        },
+                        args: Arguments {
+                            posonlyargs: [],
+                            args: [
+                                Arg {
+                                    arg: Identifier(
+                                        "a",
                                     ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 7..8,
                                 },
+                                Arg {
+                                    arg: Identifier(
+                                        "b",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 10..11,
+                                },
+                                Arg {
+                                    arg: Identifier(
+                                        "c",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 16..17,
+                                },
+                            ],
+                            vararg: None,
+                            kwonlyargs: [],
+                            kw_defaults: [],
+                            kwarg: None,
+                            defaults: [
+                                Constant(
+                                    ExprConstant {
+                                        range: 12..14,
+                                        value: Int(
+                                            20,
+                                        ),
+                                        kind: None,
+                                    },
+                                ),
+                                Constant(
+                                    ExprConstant {
+                                        range: 18..20,
+                                        value: Int(
+                                            30,
+                                        ),
+                                        kind: None,
+                                    },
+                                ),
+                            ],
+                            range: (),
+                        },
+                        body: Constant(
+                            ExprConstant {
+                                range: 22..23,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
                             },
                         ),
                     },
-                },
-            ),
-        },
+                ),
+            },
+        ),
     ],
 )

parser/src/snapshots/rustpython_parser__parser__tests__dict_unpacking.snap

@@ -2,80 +2,62 @@
 source: parser/src/parser.rs
 expression: parse_ast
 ---
-Attributed {
-    range: 0..25,
-    custom: (),
-    node: Dict(
-        ExprDict {
-            keys: [
-                Some(
-                    Attributed {
+Dict(
+    ExprDict {
+        range: 0..25,
+        keys: [
+            Some(
+                Constant(
+                    ExprConstant {
                         range: 1..4,
-                        custom: (),
-                        node: Constant(
-                            ExprConstant {
-                                value: Str(
-                                    "a",
-                                ),
-                                kind: None,
-                            },
+                        value: Str(
+                            "a",
                         ),
+                        kind: None,
                     },
                 ),
-                None,
-                Some(
-                    Attributed {
+            ),
+            None,
+            Some(
+                Constant(
+                    ExprConstant {
                         range: 16..19,
-                        custom: (),
-                        node: Constant(
-                            ExprConstant {
-                                value: Str(
-                                    "d",
-                                ),
-                                kind: None,
-                            },
+                        value: Str(
+                            "d",
                         ),
+                        kind: None,
                     },
                 ),
-            ],
-            values: [
-                Attributed {
+            ),
+        ],
+        values: [
+            Constant(
+                ExprConstant {
                     range: 6..9,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Str(
-                                "b",
-                            ),
-                            kind: None,
-                        },
+                    value: Str(
+                        "b",
                     ),
+                    kind: None,
                 },
-                Attributed {
+            ),
+            Name(
+                ExprName {
                     range: 13..14,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "c",
-                            ),
-                            ctx: Load,
-                        },
+                    id: Identifier(
+                        "c",
                     ),
+                    ctx: Load,
                 },
-                Attributed {
+            ),
+            Constant(
+                ExprConstant {
                     range: 21..24,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Str(
-                                "e",
-                            ),
-                            kind: None,
-                        },
+                    value: Str(
+                        "e",
                     ),
+                    kind: None,
                 },
-            ],
-        },
-    ),
-}
+            ),
+        ],
+    },
+)

parser/src/snapshots/rustpython_parser__parser__tests__generator_expression_argument.snap

@@ -2,213 +2,157 @@
 source: parser/src/parser.rs
 expression: parse_ast
 ---
-Attributed {
-    range: 0..141,
-    custom: (),
-    node: Call(
-        ExprCall {
-            func: Attributed {
+Call(
+    ExprCall {
+        range: 0..141,
+        func: Attribute(
+            ExprAttribute {
                 range: 0..8,
-                custom: (),
-                node: Attribute(
-                    ExprAttribute {
-                        value: Attributed {
-                            range: 0..3,
-                            custom: (),
-                            node: Constant(
-                                ExprConstant {
-                                    value: Str(
-                                        " ",
-                                    ),
-                                    kind: None,
-                                },
-                            ),
-                        },
-                        attr: Identifier(
-                            "join",
+                value: Constant(
+                    ExprConstant {
+                        range: 0..3,
+                        value: Str(
+                            " ",
                         ),
-                        ctx: Load,
+                        kind: None,
                     },
                 ),
+                attr: Identifier(
+                    "join",
+                ),
+                ctx: Load,
             },
-            args: [
-                Attributed {
+        ),
+        args: [
+            GeneratorExp(
+                ExprGeneratorExp {
                     range: 14..139,
-                    custom: (),
-                    node: GeneratorExp(
-                        ExprGeneratorExp {
-                            elt: Attributed {
-                                range: 14..17,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "sql",
-                                        ),
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
-                            generators: [
-                                Comprehension {
-                                    target: Attributed {
-                                        range: 26..29,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "sql",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                    iter: Attributed {
-                                        range: 33..139,
-                                        custom: (),
-                                        node: Tuple(
-                                            ExprTuple {
-                                                elts: [
-                                                    Attributed {
-                                                        range: 43..80,
-                                                        custom: (),
-                                                        node: IfExp(
-                                                            ExprIfExp {
-                                                                test: Attributed {
-                                                                    range: 65..70,
-                                                                    custom: (),
-                                                                    node: Name(
-                                                                        ExprName {
-                                                                            id: Identifier(
-                                                                                "limit",
-                                                                            ),
-                                                                            ctx: Load,
-                                                                        },
-                                                                    ),
-                                                                },
-                                                                body: Attributed {
-                                                                    range: 43..61,
-                                                                    custom: (),
-                                                                    node: BinOp(
-                                                                        ExprBinOp {
-                                                                            left: Attributed {
-                                                                                range: 43..53,
-                                                                                custom: (),
-                                                                                node: Constant(
-                                                                                    ExprConstant {
-                                                                                        value: Str(
-                                                                                            "LIMIT %d",
-                                                                                        ),
-                                                                                        kind: None,
-                                                                                    },
-                                                                                ),
-                                                                            },
-                                                                            op: Mod,
-                                                                            right: Attributed {
-                                                                                range: 56..61,
-                                                                                custom: (),
-                                                                                node: Name(
-                                                                                    ExprName {
-                                                                                        id: Identifier(
-                                                                                            "limit",
-                                                                                        ),
-                                                                                        ctx: Load,
-                                                                                    },
-                                                                                ),
-                                                                            },
-                                                                        },
-                                                                    ),
-                                                                },
-                                                                orelse: Attributed {
-                                                                    range: 76..80,
-                                                                    custom: (),
-                                                                    node: Constant(
-                                                                        ExprConstant {
-                                                                            value: None,
-                                                                            kind: None,
-                                                                        },
-                                                                    ),
-                                                                },
-                                                            },
-                                                        ),
-                                                    },
-                                                    Attributed {
-                                                        range: 90..132,
-                                                        custom: (),
-                                                        node: IfExp(
-                                                            ExprIfExp {
-                                                                test: Attributed {
-                                                                    range: 116..122,
-                                                                    custom: (),
-                                                                    node: Name(
-                                                                        ExprName {
-                                                                            id: Identifier(
-                                                                                "offset",
-                                                                            ),
-                                                                            ctx: Load,
-                                                                        },
-                                                                    ),
-                                                                },
-                                                                body: Attributed {
-                                                                    range: 91..111,
-                                                                    custom: (),
-                                                                    node: BinOp(
-                                                                        ExprBinOp {
-                                                                            left: Attributed {
-                                                                                range: 91..102,
-                                                                                custom: (),
-                                                                                node: Constant(
-                                                                                    ExprConstant {
-                                                                                        value: Str(
-                                                                                            "OFFSET %d",
-                                                                                        ),
-                                                                                        kind: None,
-                                                                                    },
-                                                                                ),
-                                                                            },
-                                                                            op: Mod,
-                                                                            right: Attributed {
-                                                                                range: 105..111,
-                                                                                custom: (),
-                                                                                node: Name(
-                                                                                    ExprName {
-                                                                                        id: Identifier(
-                                                                                            "offset",
-                                                                                        ),
-                                                                                        ctx: Load,
-                                                                                    },
-                                                                                ),
-                                                                            },
-                                                                        },
-                                                                    ),
-                                                                },
-                                                                orelse: Attributed {
-                                                                    range: 128..132,
-                                                                    custom: (),
-                                                                    node: Constant(
-                                                                        ExprConstant {
-                                                                            value: None,
-                                                                            kind: None,
-                                                                        },
-                                                                    ),
-                                                                },
-                                                            },
-                                                        ),
-                                                    },
-                                                ],
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    },
-                                    ifs: [],
-                                    is_async: false,
-                                },
-                            ],
+                    elt: Name(
+                        ExprName {
+                            range: 14..17,
+                            id: Identifier(
+                                "sql",
+                            ),
+                            ctx: Load,
                         },
                     ),
+                    generators: [
+                        Comprehension {
+                            target: Name(
+                                ExprName {
+                                    range: 26..29,
+                                    id: Identifier(
+                                        "sql",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                            iter: Tuple(
+                                ExprTuple {
+                                    range: 33..139,
+                                    elts: [
+                                        IfExp(
+                                            ExprIfExp {
+                                                range: 43..80,
+                                                test: Name(
+                                                    ExprName {
+                                                        range: 65..70,
+                                                        id: Identifier(
+                                                            "limit",
+                                                        ),
+                                                        ctx: Load,
+                                                    },
+                                                ),
+                                                body: BinOp(
+                                                    ExprBinOp {
+                                                        range: 43..61,
+                                                        left: Constant(
+                                                            ExprConstant {
+                                                                range: 43..53,
+                                                                value: Str(
+                                                                    "LIMIT %d",
+                                                                ),
+                                                                kind: None,
+                                                            },
+                                                        ),
+                                                        op: Mod,
+                                                        right: Name(
+                                                            ExprName {
+                                                                range: 56..61,
+                                                                id: Identifier(
+                                                                    "limit",
+                                                                ),
+                                                                ctx: Load,
+                                                            },
+                                                        ),
+                                                    },
+                                                ),
+                                                orelse: Constant(
+                                                    ExprConstant {
+                                                        range: 76..80,
+                                                        value: None,
+                                                        kind: None,
+                                                    },
+                                                ),
+                                            },
+                                        ),
+                                        IfExp(
+                                            ExprIfExp {
+                                                range: 90..132,
+                                                test: Name(
+                                                    ExprName {
+                                                        range: 116..122,
+                                                        id: Identifier(
+                                                            "offset",
+                                                        ),
+                                                        ctx: Load,
+                                                    },
+                                                ),
+                                                body: BinOp(
+                                                    ExprBinOp {
+                                                        range: 91..111,
+                                                        left: Constant(
+                                                            ExprConstant {
+                                                                range: 91..102,
+                                                                value: Str(
+                                                                    "OFFSET %d",
+                                                                ),
+                                                                kind: None,
+                                                            },
+                                                        ),
+                                                        op: Mod,
+                                                        right: Name(
+                                                            ExprName {
+                                                                range: 105..111,
+                                                                id: Identifier(
+                                                                    "offset",
+                                                                ),
+                                                                ctx: Load,
+                                                            },
+                                                        ),
+                                                    },
+                                                ),
+                                                orelse: Constant(
+                                                    ExprConstant {
+                                                        range: 128..132,
+                                                        value: None,
+                                                        kind: None,
+                                                    },
+                                                ),
+                                            },
+                                        ),
+                                    ],
+                                    ctx: Load,
+                                },
+                            ),
+                            ifs: [],
+                            is_async: false,
+                            range: (),
+                        },
+                    ],
                 },
-            ],
-            keywords: [],
-        },
-    ),
-}
+            ),
+        ],
+        keywords: [],
+    },
+)

parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_and.snap

@@ -2,38 +2,29 @@
 source: parser/src/parser.rs
 expression: parse_ast
 ---
-Attributed {
-    range: 0..7,
-    custom: (),
-    node: BoolOp(
-        ExprBoolOp {
-            op: And,
-            values: [
-                Attributed {
+BoolOp(
+    ExprBoolOp {
+        range: 0..7,
+        op: And,
+        values: [
+            Name(
+                ExprName {
                     range: 0..1,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "x",
-                            ),
-                            ctx: Load,
-                        },
+                    id: Identifier(
+                        "x",
                     ),
+                    ctx: Load,
                 },
-                Attributed {
+            ),
+            Name(
+                ExprName {
                     range: 6..7,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "y",
-                            ),
-                            ctx: Load,
-                        },
+                    id: Identifier(
+                        "y",
                     ),
+                    ctx: Load,
                 },
-            ],
-        },
-    ),
-}
+            ),
+        ],
+    },
+)

parser/src/snapshots/rustpython_parser__parser__tests__parse_bool_op_or.snap

@@ -2,38 +2,29 @@
 source: parser/src/parser.rs
 expression: parse_ast
 ---
-Attributed {
-    range: 0..6,
-    custom: (),
-    node: BoolOp(
-        ExprBoolOp {
-            op: Or,
-            values: [
-                Attributed {
+BoolOp(
+    ExprBoolOp {
+        range: 0..6,
+        op: Or,
+        values: [
+            Name(
+                ExprName {
                     range: 0..1,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "x",
-                            ),
-                            ctx: Load,
-                        },
+                    id: Identifier(
+                        "x",
                     ),
+                    ctx: Load,
                 },
-                Attributed {
+            ),
+            Name(
+                ExprName {
                     range: 5..6,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "y",
-                            ),
-                            ctx: Load,
-                        },
+                    id: Identifier(
+                        "y",
                     ),
+                    ctx: Load,
                 },
-            ],
-        },
-    ),
-}
+            ),
+        ],
+    },
+)

parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap

@@ -3,153 +3,128 @@ source: parser/src/parser.rs
 expression: "parse_program(source, \"<test>\").unwrap()"
 ---
 [
-    Attributed {
-        range: 0..98,
-        custom: (),
-        node: ClassDef(
-            StmtClassDef {
-                name: Identifier(
-                    "Foo",
-                ),
-                bases: [
-                    Attributed {
+    ClassDef(
+        StmtClassDef {
+            range: 0..98,
+            name: Identifier(
+                "Foo",
+            ),
+            bases: [
+                Name(
+                    ExprName {
                         range: 10..11,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "A",
-                                ),
-                                ctx: Load,
-                            },
+                        id: Identifier(
+                            "A",
                         ),
+                        ctx: Load,
                     },
-                    Attributed {
+                ),
+                Name(
+                    ExprName {
                         range: 13..14,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "B",
-                                ),
-                                ctx: Load,
-                            },
+                        id: Identifier(
+                            "B",
                         ),
+                        ctx: Load,
                     },
-                ],
-                keywords: [],
-                body: [
-                    Attributed {
+                ),
+            ],
+            keywords: [],
+            body: [
+                FunctionDef(
+                    StmtFunctionDef {
                         range: 18..44,
-                        custom: (),
-                        node: FunctionDef(
-                            StmtFunctionDef {
-                                name: Identifier(
-                                    "__init__",
-                                ),
-                                args: Arguments {
-                                    posonlyargs: [],
-                                    args: [
-                                        Attributed {
-                                            range: 31..35,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "self",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                    ],
-                                    vararg: None,
-                                    kwonlyargs: [],
-                                    kw_defaults: [],
-                                    kwarg: None,
-                                    defaults: [],
-                                },
-                                body: [
-                                    Attributed {
-                                        range: 40..44,
-                                        custom: (),
-                                        node: Pass,
-                                    },
-                                ],
-                                decorator_list: [],
-                                returns: None,
-                                type_comment: None,
-                            },
+                        name: Identifier(
+                            "__init__",
                         ),
+                        args: Arguments {
+                            posonlyargs: [],
+                            args: [
+                                Arg {
+                                    arg: Identifier(
+                                        "self",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 31..35,
+                                },
+                            ],
+                            vararg: None,
+                            kwonlyargs: [],
+                            kw_defaults: [],
+                            kwarg: None,
+                            defaults: [],
+                            range: (),
+                        },
+                        body: [
+                            Pass(
+                                StmtPass {
+                                    range: 40..44,
+                                },
+                            ),
+                        ],
+                        decorator_list: [],
+                        returns: None,
+                        type_comment: None,
                     },
-                    Attributed {
+                ),
+                FunctionDef(
+                    StmtFunctionDef {
                         range: 46..98,
-                        custom: (),
-                        node: FunctionDef(
-                            StmtFunctionDef {
-                                name: Identifier(
-                                    "method_with_default",
-                                ),
-                                args: Arguments {
-                                    posonlyargs: [],
-                                    args: [
-                                        Attributed {
-                                            range: 70..74,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "self",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                        Attributed {
-                                            range: 76..79,
-                                            custom: (),
-                                            node: ArgData {
-                                                arg: Identifier(
-                                                    "arg",
-                                                ),
-                                                annotation: None,
-                                                type_comment: None,
-                                            },
-                                        },
-                                    ],
-                                    vararg: None,
-                                    kwonlyargs: [],
-                                    kw_defaults: [],
-                                    kwarg: None,
-                                    defaults: [
-                                        Attributed {
-                                            range: 80..89,
-                                            custom: (),
-                                            node: Constant(
-                                                ExprConstant {
-                                                    value: Str(
-                                                        "default",
-                                                    ),
-                                                    kind: None,
-                                                },
-                                            ),
-                                        },
-                                    ],
-                                },
-                                body: [
-                                    Attributed {
-                                        range: 94..98,
-                                        custom: (),
-                                        node: Pass,
-                                    },
-                                ],
-                                decorator_list: [],
-                                returns: None,
-                                type_comment: None,
-                            },
+                        name: Identifier(
+                            "method_with_default",
                         ),
+                        args: Arguments {
+                            posonlyargs: [],
+                            args: [
+                                Arg {
+                                    arg: Identifier(
+                                        "self",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 70..74,
+                                },
+                                Arg {
+                                    arg: Identifier(
+                                        "arg",
+                                    ),
+                                    annotation: None,
+                                    type_comment: None,
+                                    range: 76..79,
+                                },
+                            ],
+                            vararg: None,
+                            kwonlyargs: [],
+                            kw_defaults: [],
+                            kwarg: None,
+                            defaults: [
+                                Constant(
+                                    ExprConstant {
+                                        range: 80..89,
+                                        value: Str(
+                                            "default",
+                                        ),
+                                        kind: None,
+                                    },
+                                ),
+                            ],
+                            range: (),
+                        },
+                        body: [
+                            Pass(
+                                StmtPass {
+                                    range: 94..98,
+                                },
+                            ),
+                        ],
+                        decorator_list: [],
+                        returns: None,
+                        type_comment: None,
                     },
-                ],
-                decorator_list: [],
-            },
-        ),
-    },
+                ),
+            ],
+            decorator_list: [],
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__parse_dict_comprehension.snap

@@ -2,65 +2,51 @@
 source: parser/src/parser.rs
 expression: parse_ast
 ---
-Attributed {
-    range: 0..19,
-    custom: (),
-    node: DictComp(
-        ExprDictComp {
-            key: Attributed {
+DictComp(
+    ExprDictComp {
+        range: 0..19,
+        key: Name(
+            ExprName {
                 range: 1..3,
-                custom: (),
-                node: Name(
-                    ExprName {
-                        id: Identifier(
-                            "x1",
-                        ),
-                        ctx: Load,
-                    },
+                id: Identifier(
+                    "x1",
                 ),
+                ctx: Load,
             },
-            value: Attributed {
+        ),
+        value: Name(
+            ExprName {
                 range: 5..7,
-                custom: (),
-                node: Name(
+                id: Identifier(
+                    "x2",
+                ),
+                ctx: Load,
+            },
+        ),
+        generators: [
+            Comprehension {
+                target: Name(
                     ExprName {
+                        range: 12..13,
                         id: Identifier(
-                            "x2",
+                            "y",
+                        ),
+                        ctx: Store,
+                    },
+                ),
+                iter: Name(
+                    ExprName {
+                        range: 17..18,
+                        id: Identifier(
+                            "z",
                         ),
                         ctx: Load,
                     },
                 ),
+                ifs: [],
+                is_async: false,
+                range: (),
             },
-            generators: [
-                Comprehension {
-                    target: Attributed {
-                        range: 12..13,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "y",
-                                ),
-                                ctx: Store,
-                            },
-                        ),
-                    },
-                    iter: Attributed {
-                        range: 17..18,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "z",
-                                ),
-                                ctx: Load,
-                            },
-                        ),
-                    },
-                    ifs: [],
-                    is_async: false,
-                },
-            ],
-        },
-    ),
-}
+        ],
+    },
+)

parser/src/snapshots/rustpython_parser__parser__tests__parse_double_list_comprehension.snap

@@ -2,179 +2,139 @@
 source: parser/src/parser.rs
 expression: parse_ast
 ---
-Attributed {
-    range: 0..48,
-    custom: (),
-    node: ListComp(
-        ExprListComp {
-            elt: Attributed {
+ListComp(
+    ExprListComp {
+        range: 0..48,
+        elt: Name(
+            ExprName {
                 range: 1..2,
-                custom: (),
-                node: Name(
+                id: Identifier(
+                    "x",
+                ),
+                ctx: Load,
+            },
+        ),
+        generators: [
+            Comprehension {
+                target: Tuple(
+                    ExprTuple {
+                        range: 7..12,
+                        elts: [
+                            Name(
+                                ExprName {
+                                    range: 7..8,
+                                    id: Identifier(
+                                        "y",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                            Name(
+                                ExprName {
+                                    range: 10..12,
+                                    id: Identifier(
+                                        "y2",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                        ],
+                        ctx: Store,
+                    },
+                ),
+                iter: Name(
                     ExprName {
+                        range: 16..17,
                         id: Identifier(
-                            "x",
+                            "z",
                         ),
                         ctx: Load,
                     },
                 ),
+                ifs: [],
+                is_async: false,
+                range: (),
             },
-            generators: [
-                Comprehension {
-                    target: Attributed {
-                        range: 7..12,
-                        custom: (),
-                        node: Tuple(
-                            ExprTuple {
-                                elts: [
-                                    Attributed {
-                                        range: 7..8,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "y",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                    Attributed {
-                                        range: 10..12,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "y2",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                ],
-                                ctx: Store,
-                            },
-                        ),
-                    },
-                    iter: Attributed {
-                        range: 16..17,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "z",
-                                ),
-                                ctx: Load,
-                            },
-                        ),
-                    },
-                    ifs: [],
-                    is_async: false,
-                },
-                Comprehension {
-                    target: Attributed {
+            Comprehension {
+                target: Name(
+                    ExprName {
                         range: 22..23,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "a",
-                                ),
-                                ctx: Store,
-                            },
+                        id: Identifier(
+                            "a",
                         ),
+                        ctx: Store,
                     },
-                    iter: Attributed {
+                ),
+                iter: Name(
+                    ExprName {
                         range: 27..28,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "b",
-                                ),
-                                ctx: Load,
-                            },
+                        id: Identifier(
+                            "b",
                         ),
+                        ctx: Load,
                     },
-                    ifs: [
-                        Attributed {
+                ),
+                ifs: [
+                    Compare(
+                        ExprCompare {
                             range: 32..37,
-                            custom: (),
-                            node: Compare(
-                                ExprCompare {
-                                    left: Attributed {
-                                        range: 32..33,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "a",
-                                                ),
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    },
-                                    ops: [
-                                        Lt,
-                                    ],
-                                    comparators: [
-                                        Attributed {
-                                            range: 36..37,
-                                            custom: (),
-                                            node: Constant(
-                                                ExprConstant {
-                                                    value: Int(
-                                                        5,
-                                                    ),
-                                                    kind: None,
-                                                },
-                                            ),
-                                        },
-                                    ],
+                            left: Name(
+                                ExprName {
+                                    range: 32..33,
+                                    id: Identifier(
+                                        "a",
+                                    ),
+                                    ctx: Load,
                                 },
                             ),
+                            ops: [
+                                Lt,
+                            ],
+                            comparators: [
+                                Constant(
+                                    ExprConstant {
+                                        range: 36..37,
+                                        value: Int(
+                                            5,
+                                        ),
+                                        kind: None,
+                                    },
+                                ),
+                            ],
                         },
-                        Attributed {
+                    ),
+                    Compare(
+                        ExprCompare {
                             range: 41..47,
-                            custom: (),
-                            node: Compare(
-                                ExprCompare {
-                                    left: Attributed {
-                                        range: 41..42,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "a",
-                                                ),
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    },
-                                    ops: [
-                                        Gt,
-                                    ],
-                                    comparators: [
-                                        Attributed {
-                                            range: 45..47,
-                                            custom: (),
-                                            node: Constant(
-                                                ExprConstant {
-                                                    value: Int(
-                                                        10,
-                                                    ),
-                                                    kind: None,
-                                                },
-                                            ),
-                                        },
-                                    ],
+                            left: Name(
+                                ExprName {
+                                    range: 41..42,
+                                    id: Identifier(
+                                        "a",
+                                    ),
+                                    ctx: Load,
                                 },
                             ),
+                            ops: [
+                                Gt,
+                            ],
+                            comparators: [
+                                Constant(
+                                    ExprConstant {
+                                        range: 45..47,
+                                        value: Int(
+                                            10,
+                                        ),
+                                        kind: None,
+                                    },
+                                ),
+                            ],
                         },
-                    ],
-                    is_async: false,
-                },
-            ],
-        },
-    ),
-}
+                    ),
+                ],
+                is_async: false,
+                range: (),
+            },
+        ],
+    },
+)

parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap

@@ -3,34 +3,25 @@ source: parser/src/parser.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..14,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..14,
+            value: JoinedStr(
+                ExprJoinedStr {
                     range: 0..14,
-                    custom: (),
-                    node: JoinedStr(
-                        ExprJoinedStr {
-                            values: [
-                                Attributed {
-                                    range: 0..14,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Str(
-                                                "Hello world",
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                        },
-                    ),
+                    values: [
+                        Constant(
+                            ExprConstant {
+                                range: 0..14,
+                                value: Str(
+                                    "Hello world",
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__parse_generator_comprehension.snap

@@ -2,53 +2,42 @@
 source: parser/src/parser.rs
 expression: parse_ast
 ---
-Attributed {
-    range: 0..14,
-    custom: (),
-    node: GeneratorExp(
-        ExprGeneratorExp {
-            elt: Attributed {
+GeneratorExp(
+    ExprGeneratorExp {
+        range: 0..14,
+        elt: Name(
+            ExprName {
                 range: 1..2,
-                custom: (),
-                node: Name(
+                id: Identifier(
+                    "x",
+                ),
+                ctx: Load,
+            },
+        ),
+        generators: [
+            Comprehension {
+                target: Name(
                     ExprName {
+                        range: 7..8,
                         id: Identifier(
-                            "x",
+                            "y",
+                        ),
+                        ctx: Store,
+                    },
+                ),
+                iter: Name(
+                    ExprName {
+                        range: 12..13,
+                        id: Identifier(
+                            "z",
                         ),
                         ctx: Load,
                     },
                 ),
+                ifs: [],
+                is_async: false,
+                range: (),
             },
-            generators: [
-                Comprehension {
-                    target: Attributed {
-                        range: 7..8,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "y",
-                                ),
-                                ctx: Store,
-                            },
-                        ),
-                    },
-                    iter: Attributed {
-                        range: 12..13,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "z",
-                                ),
-                                ctx: Load,
-                            },
-                        ),
-                    },
-                    ifs: [],
-                    is_async: false,
-                },
-            ],
-        },
-    ),
-}
+        ],
+    },
+)

parser/src/snapshots/rustpython_parser__parser__tests__parse_if_elif_else.snap

@@ -3,112 +3,82 @@ source: parser/src/parser.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..28,
-        custom: (),
-        node: If(
-            StmtIf {
-                test: Attributed {
+    If(
+        StmtIf {
+            range: 0..28,
+            test: Constant(
+                ExprConstant {
                     range: 3..4,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Int(
-                                1,
-                            ),
-                            kind: None,
-                        },
+                    value: Int(
+                        1,
                     ),
+                    kind: None,
                 },
-                body: [
-                    Attributed {
+            ),
+            body: [
+                Expr(
+                    StmtExpr {
                         range: 6..8,
-                        custom: (),
-                        node: Expr(
-                            StmtExpr {
-                                value: Attributed {
-                                    range: 6..8,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                10,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
+                        value: Constant(
+                            ExprConstant {
+                                range: 6..8,
+                                value: Int(
+                                    10,
+                                ),
+                                kind: None,
                             },
                         ),
                     },
-                ],
-                orelse: [
-                    Attributed {
+                ),
+            ],
+            orelse: [
+                If(
+                    StmtIf {
                         range: 9..28,
-                        custom: (),
-                        node: If(
-                            StmtIf {
-                                test: Attributed {
-                                    range: 14..15,
-                                    custom: (),
-                                    node: Constant(
+                        test: Constant(
+                            ExprConstant {
+                                range: 14..15,
+                                value: Int(
+                                    2,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        body: [
+                            Expr(
+                                StmtExpr {
+                                    range: 17..19,
+                                    value: Constant(
                                         ExprConstant {
+                                            range: 17..19,
                                             value: Int(
-                                                2,
+                                                20,
                                             ),
                                             kind: None,
                                         },
                                     ),
                                 },
-                                body: [
-                                    Attributed {
-                                        range: 17..19,
-                                        custom: (),
-                                        node: Expr(
-                                            StmtExpr {
-                                                value: Attributed {
-                                                    range: 17..19,
-                                                    custom: (),
-                                                    node: Constant(
-                                                        ExprConstant {
-                                                            value: Int(
-                                                                20,
-                                                            ),
-                                                            kind: None,
-                                                        },
-                                                    ),
-                                                },
-                                            },
-                                        ),
-                                    },
-                                ],
-                                orelse: [
-                                    Attributed {
-                                        range: 26..28,
-                                        custom: (),
-                                        node: Expr(
-                                            StmtExpr {
-                                                value: Attributed {
-                                                    range: 26..28,
-                                                    custom: (),
-                                                    node: Constant(
-                                                        ExprConstant {
-                                                            value: Int(
-                                                                30,
-                                                            ),
-                                                            kind: None,
-                                                        },
-                                                    ),
-                                                },
-                                            },
-                                        ),
-                                    },
-                                ],
-                            },
-                        ),
+                            ),
+                        ],
+                        orelse: [
+                            Expr(
+                                StmtExpr {
+                                    range: 26..28,
+                                    value: Constant(
+                                        ExprConstant {
+                                            range: 26..28,
+                                            value: Int(
+                                                30,
+                                            ),
+                                            kind: None,
+                                        },
+                                    ),
+                                },
+                            ),
+                        ],
                     },
-                ],
-            },
-        ),
-    },
+                ),
+            ],
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__parse_if_else_generator_comprehension.snap

@@ -2,85 +2,65 @@
 source: parser/src/parser.rs
 expression: parse_ast
 ---
-Attributed {
-    range: 0..26,
-    custom: (),
-    node: GeneratorExp(
-        ExprGeneratorExp {
-            elt: Attributed {
+GeneratorExp(
+    ExprGeneratorExp {
+        range: 0..26,
+        elt: IfExp(
+            ExprIfExp {
                 range: 1..14,
-                custom: (),
-                node: IfExp(
-                    ExprIfExp {
-                        test: Attributed {
-                            range: 6..7,
-                            custom: (),
-                            node: Name(
-                                ExprName {
-                                    id: Identifier(
-                                        "y",
-                                    ),
-                                    ctx: Load,
-                                },
-                            ),
-                        },
-                        body: Attributed {
-                            range: 1..2,
-                            custom: (),
-                            node: Name(
-                                ExprName {
-                                    id: Identifier(
-                                        "x",
-                                    ),
-                                    ctx: Load,
-                                },
-                            ),
-                        },
-                        orelse: Attributed {
-                            range: 13..14,
-                            custom: (),
-                            node: Name(
-                                ExprName {
-                                    id: Identifier(
-                                        "y",
-                                    ),
-                                    ctx: Load,
-                                },
-                            ),
-                        },
+                test: Name(
+                    ExprName {
+                        range: 6..7,
+                        id: Identifier(
+                            "y",
+                        ),
+                        ctx: Load,
+                    },
+                ),
+                body: Name(
+                    ExprName {
+                        range: 1..2,
+                        id: Identifier(
+                            "x",
+                        ),
+                        ctx: Load,
+                    },
+                ),
+                orelse: Name(
+                    ExprName {
+                        range: 13..14,
+                        id: Identifier(
+                            "y",
+                        ),
+                        ctx: Load,
                     },
                 ),
             },
-            generators: [
-                Comprehension {
-                    target: Attributed {
+        ),
+        generators: [
+            Comprehension {
+                target: Name(
+                    ExprName {
                         range: 19..20,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "y",
-                                ),
-                                ctx: Store,
-                            },
+                        id: Identifier(
+                            "y",
                         ),
+                        ctx: Store,
                     },
-                    iter: Attributed {
+                ),
+                iter: Name(
+                    ExprName {
                         range: 24..25,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "z",
-                                ),
-                                ctx: Load,
-                            },
+                        id: Identifier(
+                            "z",
                         ),
+                        ctx: Load,
                     },
-                    ifs: [],
-                    is_async: false,
-                },
-            ],
-        },
-    ),
-}
+                ),
+                ifs: [],
+                is_async: false,
+                range: (),
+            },
+        ],
+    },
+)

parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap

@@ -3,71 +3,53 @@ source: parser/src/parser.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..32,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..32,
+            value: Call(
+                ExprCall {
                     range: 0..32,
-                    custom: (),
-                    node: Call(
-                        ExprCall {
-                            func: Attributed {
-                                range: 0..7,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "my_func",
-                                        ),
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
-                            args: [
-                                Attributed {
-                                    range: 8..20,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Str(
-                                                "positional",
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                            keywords: [
-                                Attributed {
-                                    range: 22..31,
-                                    custom: (),
-                                    node: KeywordData {
-                                        arg: Some(
-                                            Identifier(
-                                                "keyword",
-                                            ),
-                                        ),
-                                        value: Attributed {
-                                            range: 30..31,
-                                            custom: (),
-                                            node: Constant(
-                                                ExprConstant {
-                                                    value: Int(
-                                                        2,
-                                                    ),
-                                                    kind: None,
-                                                },
-                                            ),
-                                        },
-                                    },
-                                },
-                            ],
+                    func: Name(
+                        ExprName {
+                            range: 0..7,
+                            id: Identifier(
+                                "my_func",
+                            ),
+                            ctx: Load,
                         },
                     ),
+                    args: [
+                        Constant(
+                            ExprConstant {
+                                range: 8..20,
+                                value: Str(
+                                    "positional",
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    keywords: [
+                        Keyword {
+                            arg: Some(
+                                Identifier(
+                                    "keyword",
+                                ),
+                            ),
+                            value: Constant(
+                                ExprConstant {
+                                    range: 30..31,
+                                    value: Int(
+                                        2,
+                                    ),
+                                    kind: None,
+                                },
+                            ),
+                            range: 22..31,
+                        },
+                    ],
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap

@@ -3,85 +3,65 @@ source: parser/src/parser.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..18,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..18,
+            value: Lambda(
+                ExprLambda {
                     range: 0..18,
-                    custom: (),
-                    node: Lambda(
-                        ExprLambda {
-                            args: Arguments {
-                                posonlyargs: [],
-                                args: [
-                                    Attributed {
-                                        range: 7..8,
-                                        custom: (),
-                                        node: ArgData {
-                                            arg: Identifier(
-                                                "x",
-                                            ),
-                                            annotation: None,
-                                            type_comment: None,
-                                        },
-                                    },
-                                    Attributed {
-                                        range: 10..11,
-                                        custom: (),
-                                        node: ArgData {
-                                            arg: Identifier(
-                                                "y",
-                                            ),
-                                            annotation: None,
-                                            type_comment: None,
-                                        },
-                                    },
-                                ],
-                                vararg: None,
-                                kwonlyargs: [],
-                                kw_defaults: [],
-                                kwarg: None,
-                                defaults: [],
-                            },
-                            body: Attributed {
-                                range: 13..18,
-                                custom: (),
-                                node: BinOp(
-                                    ExprBinOp {
-                                        left: Attributed {
-                                            range: 13..14,
-                                            custom: (),
-                                            node: Name(
-                                                ExprName {
-                                                    id: Identifier(
-                                                        "x",
-                                                    ),
-                                                    ctx: Load,
-                                                },
-                                            ),
-                                        },
-                                        op: Mult,
-                                        right: Attributed {
-                                            range: 17..18,
-                                            custom: (),
-                                            node: Name(
-                                                ExprName {
-                                                    id: Identifier(
-                                                        "y",
-                                                    ),
-                                                    ctx: Load,
-                                                },
-                                            ),
-                                        },
-                                    },
+                    args: Arguments {
+                        posonlyargs: [],
+                        args: [
+                            Arg {
+                                arg: Identifier(
+                                    "x",
                                 ),
+                                annotation: None,
+                                type_comment: None,
+                                range: 7..8,
                             },
+                            Arg {
+                                arg: Identifier(
+                                    "y",
+                                ),
+                                annotation: None,
+                                type_comment: None,
+                                range: 10..11,
+                            },
+                        ],
+                        vararg: None,
+                        kwonlyargs: [],
+                        kw_defaults: [],
+                        kwarg: None,
+                        defaults: [],
+                        range: (),
+                    },
+                    body: BinOp(
+                        ExprBinOp {
+                            range: 13..18,
+                            left: Name(
+                                ExprName {
+                                    range: 13..14,
+                                    id: Identifier(
+                                        "x",
+                                    ),
+                                    ctx: Load,
+                                },
+                            ),
+                            op: Mult,
+                            right: Name(
+                                ExprName {
+                                    range: 17..18,
+                                    id: Identifier(
+                                        "y",
+                                    ),
+                                    ctx: Load,
+                                },
+                            ),
                         },
                     ),
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__parse_list_comprehension.snap

@@ -2,53 +2,42 @@
 source: parser/src/parser.rs
 expression: parse_ast
 ---
-Attributed {
-    range: 0..14,
-    custom: (),
-    node: ListComp(
-        ExprListComp {
-            elt: Attributed {
+ListComp(
+    ExprListComp {
+        range: 0..14,
+        elt: Name(
+            ExprName {
                 range: 1..2,
-                custom: (),
-                node: Name(
+                id: Identifier(
+                    "x",
+                ),
+                ctx: Load,
+            },
+        ),
+        generators: [
+            Comprehension {
+                target: Name(
                     ExprName {
+                        range: 7..8,
                         id: Identifier(
-                            "x",
+                            "y",
+                        ),
+                        ctx: Store,
+                    },
+                ),
+                iter: Name(
+                    ExprName {
+                        range: 12..13,
+                        id: Identifier(
+                            "z",
                         ),
                         ctx: Load,
                     },
                 ),
+                ifs: [],
+                is_async: false,
+                range: (),
             },
-            generators: [
-                Comprehension {
-                    target: Attributed {
-                        range: 7..8,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "y",
-                                ),
-                                ctx: Store,
-                            },
-                        ),
-                    },
-                    iter: Attributed {
-                        range: 12..13,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "z",
-                                ),
-                                ctx: Load,
-                            },
-                        ),
-                    },
-                    ifs: [],
-                    is_async: false,
-                },
-            ],
-        },
-    ),
-}
+        ],
+    },
+)

parser/src/snapshots/rustpython_parser__parser__tests__parse_named_expression_generator_comprehension.snap

@@ -2,94 +2,71 @@
 source: parser/src/parser.rs
 expression: parse_ast
 ---
-Attributed {
-    range: 0..23,
-    custom: (),
-    node: GeneratorExp(
-        ExprGeneratorExp {
-            elt: Attributed {
+GeneratorExp(
+    ExprGeneratorExp {
+        range: 0..23,
+        elt: NamedExpr(
+            ExprNamedExpr {
                 range: 1..11,
-                custom: (),
-                node: NamedExpr(
-                    ExprNamedExpr {
-                        target: Attributed {
-                            range: 1..2,
-                            custom: (),
-                            node: Name(
-                                ExprName {
-                                    id: Identifier(
-                                        "x",
-                                    ),
-                                    ctx: Store,
-                                },
-                            ),
-                        },
-                        value: Attributed {
-                            range: 6..11,
-                            custom: (),
-                            node: BinOp(
-                                ExprBinOp {
-                                    left: Attributed {
-                                        range: 6..7,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "y",
-                                                ),
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    },
-                                    op: Add,
-                                    right: Attributed {
-                                        range: 10..11,
-                                        custom: (),
-                                        node: Constant(
-                                            ExprConstant {
-                                                value: Int(
-                                                    1,
-                                                ),
-                                                kind: None,
-                                            },
-                                        ),
-                                    },
-                                },
-                            ),
-                        },
+                target: Name(
+                    ExprName {
+                        range: 1..2,
+                        id: Identifier(
+                            "x",
+                        ),
+                        ctx: Store,
                     },
                 ),
-            },
-            generators: [
-                Comprehension {
-                    target: Attributed {
-                        range: 16..17,
-                        custom: (),
-                        node: Name(
+                value: BinOp(
+                    ExprBinOp {
+                        range: 6..11,
+                        left: Name(
                             ExprName {
+                                range: 6..7,
                                 id: Identifier(
                                     "y",
                                 ),
-                                ctx: Store,
-                            },
-                        ),
-                    },
-                    iter: Attributed {
-                        range: 21..22,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "z",
-                                ),
                                 ctx: Load,
                             },
                         ),
+                        op: Add,
+                        right: Constant(
+                            ExprConstant {
+                                range: 10..11,
+                                value: Int(
+                                    1,
+                                ),
+                                kind: None,
+                            },
+                        ),
                     },
-                    ifs: [],
-                    is_async: false,
-                },
-            ],
-        },
-    ),
-}
+                ),
+            },
+        ),
+        generators: [
+            Comprehension {
+                target: Name(
+                    ExprName {
+                        range: 16..17,
+                        id: Identifier(
+                            "y",
+                        ),
+                        ctx: Store,
+                    },
+                ),
+                iter: Name(
+                    ExprName {
+                        range: 21..22,
+                        id: Identifier(
+                            "z",
+                        ),
+                        ctx: Load,
+                    },
+                ),
+                ifs: [],
+                is_async: false,
+                range: (),
+            },
+        ],
+    },
+)

parser/src/snapshots/rustpython_parser__parser__tests__parse_print_2.snap

@@ -3,59 +3,44 @@ source: parser/src/parser.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..23,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..23,
+            value: Call(
+                ExprCall {
                     range: 0..23,
-                    custom: (),
-                    node: Call(
-                        ExprCall {
-                            func: Attributed {
-                                range: 0..5,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "print",
-                                        ),
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
-                            args: [
-                                Attributed {
-                                    range: 6..19,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Str(
-                                                "Hello world",
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 21..22,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                2,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                            keywords: [],
+                    func: Name(
+                        ExprName {
+                            range: 0..5,
+                            id: Identifier(
+                                "print",
+                            ),
+                            ctx: Load,
                         },
                     ),
+                    args: [
+                        Constant(
+                            ExprConstant {
+                                range: 6..19,
+                                value: Str(
+                                    "Hello world",
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        Constant(
+                            ExprConstant {
+                                range: 21..22,
+                                value: Int(
+                                    2,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    keywords: [],
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__parse_print_hello.snap

@@ -3,47 +3,35 @@ source: parser/src/parser.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..20,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..20,
+            value: Call(
+                ExprCall {
                     range: 0..20,
-                    custom: (),
-                    node: Call(
-                        ExprCall {
-                            func: Attributed {
-                                range: 0..5,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "print",
-                                        ),
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
-                            args: [
-                                Attributed {
-                                    range: 6..19,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Str(
-                                                "Hello world",
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                            keywords: [],
+                    func: Name(
+                        ExprName {
+                            range: 0..5,
+                            id: Identifier(
+                                "print",
+                            ),
+                            ctx: Load,
                         },
                     ),
+                    args: [
+                        Constant(
+                            ExprConstant {
+                                range: 6..19,
+                                value: Str(
+                                    "Hello world",
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    keywords: [],
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap

@@ -3,24 +3,18 @@ source: parser/src/parser.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..13,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..13,
+            value: Constant(
+                ExprConstant {
                     range: 0..13,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Str(
-                                "Hello world",
-                            ),
-                            kind: None,
-                        },
+                    value: Str(
+                        "Hello world",
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap

@@ -3,85 +3,64 @@ source: parser/src/parser.rs
 expression: "parse_program(source, \"<test>\").unwrap()"
 ---
 [
-    Attributed {
-        range: 0..11,
-        custom: (),
-        node: Assign(
-            StmtAssign {
-                targets: [
-                    Attributed {
+    Assign(
+        StmtAssign {
+            range: 0..11,
+            targets: [
+                Tuple(
+                    ExprTuple {
                         range: 0..4,
-                        custom: (),
-                        node: Tuple(
-                            ExprTuple {
-                                elts: [
-                                    Attributed {
-                                        range: 0..1,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "a",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                    Attributed {
-                                        range: 3..4,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "b",
-                                                ),
-                                                ctx: Store,
-                                            },
-                                        ),
-                                    },
-                                ],
-                                ctx: Store,
+                        elts: [
+                            Name(
+                                ExprName {
+                                    range: 0..1,
+                                    id: Identifier(
+                                        "a",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                            Name(
+                                ExprName {
+                                    range: 3..4,
+                                    id: Identifier(
+                                        "b",
+                                    ),
+                                    ctx: Store,
+                                },
+                            ),
+                        ],
+                        ctx: Store,
+                    },
+                ),
+            ],
+            value: Tuple(
+                ExprTuple {
+                    range: 7..11,
+                    elts: [
+                        Constant(
+                            ExprConstant {
+                                range: 7..8,
+                                value: Int(
+                                    4,
+                                ),
+                                kind: None,
                             },
                         ),
-                    },
-                ],
-                value: Attributed {
-                    range: 7..11,
-                    custom: (),
-                    node: Tuple(
-                        ExprTuple {
-                            elts: [
-                                Attributed {
-                                    range: 7..8,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                4,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 10..11,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Int(
-                                                5,
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                            ctx: Load,
-                        },
-                    ),
+                        Constant(
+                            ExprConstant {
+                                range: 10..11,
+                                value: Int(
+                                    5,
+                                ),
+                                kind: None,
+                            },
+                        ),
+                    ],
+                    ctx: Load,
                 },
-                type_comment: None,
-            },
-        ),
-    },
+            ),
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__slice.snap

@@ -2,74 +2,56 @@
 source: parser/src/parser.rs
 expression: parse_ast
 ---
-Attributed {
-    range: 0..8,
-    custom: (),
-    node: Subscript(
-        ExprSubscript {
-            value: Attributed {
+Subscript(
+    ExprSubscript {
+        range: 0..8,
+        value: Name(
+            ExprName {
                 range: 0..1,
-                custom: (),
-                node: Name(
-                    ExprName {
-                        id: Identifier(
-                            "x",
-                        ),
-                        ctx: Load,
-                    },
+                id: Identifier(
+                    "x",
                 ),
+                ctx: Load,
             },
-            slice: Attributed {
+        ),
+        slice: Slice(
+            ExprSlice {
                 range: 2..7,
-                custom: (),
-                node: Slice(
-                    ExprSlice {
-                        lower: Some(
-                            Attributed {
-                                range: 2..3,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            1,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                        ),
-                        upper: Some(
-                            Attributed {
-                                range: 4..5,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            2,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                        ),
-                        step: Some(
-                            Attributed {
-                                range: 6..7,
-                                custom: (),
-                                node: Constant(
-                                    ExprConstant {
-                                        value: Int(
-                                            3,
-                                        ),
-                                        kind: None,
-                                    },
-                                ),
-                            },
-                        ),
-                    },
+                lower: Some(
+                    Constant(
+                        ExprConstant {
+                            range: 2..3,
+                            value: Int(
+                                1,
+                            ),
+                            kind: None,
+                        },
+                    ),
+                ),
+                upper: Some(
+                    Constant(
+                        ExprConstant {
+                            range: 4..5,
+                            value: Int(
+                                2,
+                            ),
+                            kind: None,
+                        },
+                    ),
+                ),
+                step: Some(
+                    Constant(
+                        ExprConstant {
+                            range: 6..7,
+                            value: Int(
+                                3,
+                            ),
+                            kind: None,
+                        },
+                    ),
                 ),
             },
-            ctx: Load,
-        },
-    ),
-}
+        ),
+        ctx: Load,
+    },
+)

parser/src/snapshots/rustpython_parser__parser__tests__star_index.snap

@@ -3,402 +3,291 @@ source: parser/src/parser.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..36,
-        custom: (),
-        node: Assign(
-            StmtAssign {
-                targets: [
-                    Attributed {
+    Assign(
+        StmtAssign {
+            range: 0..36,
+            targets: [
+                Name(
+                    ExprName {
                         range: 0..11,
-                        custom: (),
-                        node: Name(
-                            ExprName {
-                                id: Identifier(
-                                    "array_slice",
-                                ),
-                                ctx: Store,
-                            },
+                        id: Identifier(
+                            "array_slice",
                         ),
+                        ctx: Store,
                     },
-                ],
-                value: Attributed {
+                ),
+            ],
+            value: Subscript(
+                ExprSubscript {
                     range: 14..36,
-                    custom: (),
-                    node: Subscript(
-                        ExprSubscript {
-                            value: Attributed {
-                                range: 14..19,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "array",
-                                        ),
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
-                            slice: Attributed {
-                                range: 20..35,
-                                custom: (),
-                                node: Tuple(
-                                    ExprTuple {
-                                        elts: [
-                                            Attributed {
-                                                range: 20..21,
-                                                custom: (),
-                                                node: Constant(
-                                                    ExprConstant {
-                                                        value: Int(
-                                                            0,
-                                                        ),
-                                                        kind: None,
-                                                    },
-                                                ),
-                                            },
-                                            Attributed {
-                                                range: 23..31,
-                                                custom: (),
-                                                node: Starred(
-                                                    ExprStarred {
-                                                        value: Attributed {
-                                                            range: 24..31,
-                                                            custom: (),
-                                                            node: Name(
-                                                                ExprName {
-                                                                    id: Identifier(
-                                                                        "indexes",
-                                                                    ),
-                                                                    ctx: Load,
-                                                                },
-                                                            ),
-                                                        },
-                                                        ctx: Load,
-                                                    },
-                                                ),
-                                            },
-                                            Attributed {
-                                                range: 33..35,
-                                                custom: (),
-                                                node: UnaryOp(
-                                                    ExprUnaryOp {
-                                                        op: USub,
-                                                        operand: Attributed {
-                                                            range: 34..35,
-                                                            custom: (),
-                                                            node: Constant(
-                                                                ExprConstant {
-                                                                    value: Int(
-                                                                        1,
-                                                                    ),
-                                                                    kind: None,
-                                                                },
-                                                            ),
-                                                        },
-                                                    },
-                                                ),
-                                            },
-                                        ],
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
-                            ctx: Load,
-                        },
-                    ),
-                },
-                type_comment: None,
-            },
-        ),
-    },
-    Attributed {
-        range: 37..73,
-        custom: (),
-        node: Assign(
-            StmtAssign {
-                targets: [
-                    Attributed {
-                        range: 37..59,
-                        custom: (),
-                        node: Subscript(
-                            ExprSubscript {
-                                value: Attributed {
-                                    range: 37..42,
-                                    custom: (),
-                                    node: Name(
-                                        ExprName {
-                                            id: Identifier(
-                                                "array",
-                                            ),
-                                            ctx: Load,
-                                        },
-                                    ),
-                                },
-                                slice: Attributed {
-                                    range: 43..58,
-                                    custom: (),
-                                    node: Tuple(
-                                        ExprTuple {
-                                            elts: [
-                                                Attributed {
-                                                    range: 43..44,
-                                                    custom: (),
-                                                    node: Constant(
-                                                        ExprConstant {
-                                                            value: Int(
-                                                                0,
-                                                            ),
-                                                            kind: None,
-                                                        },
-                                                    ),
-                                                },
-                                                Attributed {
-                                                    range: 46..54,
-                                                    custom: (),
-                                                    node: Starred(
-                                                        ExprStarred {
-                                                            value: Attributed {
-                                                                range: 47..54,
-                                                                custom: (),
-                                                                node: Name(
-                                                                    ExprName {
-                                                                        id: Identifier(
-                                                                            "indexes",
-                                                                        ),
-                                                                        ctx: Load,
-                                                                    },
-                                                                ),
-                                                            },
-                                                            ctx: Load,
-                                                        },
-                                                    ),
-                                                },
-                                                Attributed {
-                                                    range: 56..58,
-                                                    custom: (),
-                                                    node: UnaryOp(
-                                                        ExprUnaryOp {
-                                                            op: USub,
-                                                            operand: Attributed {
-                                                                range: 57..58,
-                                                                custom: (),
-                                                                node: Constant(
-                                                                    ExprConstant {
-                                                                        value: Int(
-                                                                            1,
-                                                                        ),
-                                                                        kind: None,
-                                                                    },
-                                                                ),
-                                                            },
-                                                        },
-                                                    ),
-                                                },
-                                            ],
-                                            ctx: Load,
-                                        },
-                                    ),
-                                },
-                                ctx: Store,
-                            },
-                        ),
-                    },
-                ],
-                value: Attributed {
-                    range: 62..73,
-                    custom: (),
-                    node: Name(
+                    value: Name(
                         ExprName {
+                            range: 14..19,
                             id: Identifier(
-                                "array_slice",
+                                "array",
                             ),
                             ctx: Load,
                         },
                     ),
+                    slice: Tuple(
+                        ExprTuple {
+                            range: 20..35,
+                            elts: [
+                                Constant(
+                                    ExprConstant {
+                                        range: 20..21,
+                                        value: Int(
+                                            0,
+                                        ),
+                                        kind: None,
+                                    },
+                                ),
+                                Starred(
+                                    ExprStarred {
+                                        range: 23..31,
+                                        value: Name(
+                                            ExprName {
+                                                range: 24..31,
+                                                id: Identifier(
+                                                    "indexes",
+                                                ),
+                                                ctx: Load,
+                                            },
+                                        ),
+                                        ctx: Load,
+                                    },
+                                ),
+                                UnaryOp(
+                                    ExprUnaryOp {
+                                        range: 33..35,
+                                        op: USub,
+                                        operand: Constant(
+                                            ExprConstant {
+                                                range: 34..35,
+                                                value: Int(
+                                                    1,
+                                                ),
+                                                kind: None,
+                                            },
+                                        ),
+                                    },
+                                ),
+                            ],
+                            ctx: Load,
+                        },
+                    ),
+                    ctx: Load,
                 },
-                type_comment: None,
-            },
-        ),
-    },
-    Attributed {
-        range: 74..119,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+            ),
+            type_comment: None,
+        },
+    ),
+    Assign(
+        StmtAssign {
+            range: 37..73,
+            targets: [
+                Subscript(
+                    ExprSubscript {
+                        range: 37..59,
+                        value: Name(
+                            ExprName {
+                                range: 37..42,
+                                id: Identifier(
+                                    "array",
+                                ),
+                                ctx: Load,
+                            },
+                        ),
+                        slice: Tuple(
+                            ExprTuple {
+                                range: 43..58,
+                                elts: [
+                                    Constant(
+                                        ExprConstant {
+                                            range: 43..44,
+                                            value: Int(
+                                                0,
+                                            ),
+                                            kind: None,
+                                        },
+                                    ),
+                                    Starred(
+                                        ExprStarred {
+                                            range: 46..54,
+                                            value: Name(
+                                                ExprName {
+                                                    range: 47..54,
+                                                    id: Identifier(
+                                                        "indexes",
+                                                    ),
+                                                    ctx: Load,
+                                                },
+                                            ),
+                                            ctx: Load,
+                                        },
+                                    ),
+                                    UnaryOp(
+                                        ExprUnaryOp {
+                                            range: 56..58,
+                                            op: USub,
+                                            operand: Constant(
+                                                ExprConstant {
+                                                    range: 57..58,
+                                                    value: Int(
+                                                        1,
+                                                    ),
+                                                    kind: None,
+                                                },
+                                            ),
+                                        },
+                                    ),
+                                ],
+                                ctx: Load,
+                            },
+                        ),
+                        ctx: Store,
+                    },
+                ),
+            ],
+            value: Name(
+                ExprName {
+                    range: 62..73,
+                    id: Identifier(
+                        "array_slice",
+                    ),
+                    ctx: Load,
+                },
+            ),
+            type_comment: None,
+        },
+    ),
+    Expr(
+        StmtExpr {
+            range: 74..119,
+            value: Subscript(
+                ExprSubscript {
                     range: 74..119,
-                    custom: (),
-                    node: Subscript(
-                        ExprSubscript {
-                            value: Attributed {
-                                range: 74..79,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "array",
+                    value: Name(
+                        ExprName {
+                            range: 74..79,
+                            id: Identifier(
+                                "array",
+                            ),
+                            ctx: Load,
+                        },
+                    ),
+                    slice: Tuple(
+                        ExprTuple {
+                            range: 80..118,
+                            elts: [
+                                Starred(
+                                    ExprStarred {
+                                        range: 80..98,
+                                        value: Name(
+                                            ExprName {
+                                                range: 81..98,
+                                                id: Identifier(
+                                                    "indexes_to_select",
+                                                ),
+                                                ctx: Load,
+                                            },
                                         ),
                                         ctx: Load,
                                     },
                                 ),
-                            },
-                            slice: Attributed {
-                                range: 80..118,
-                                custom: (),
-                                node: Tuple(
-                                    ExprTuple {
-                                        elts: [
-                                            Attributed {
-                                                range: 80..98,
-                                                custom: (),
-                                                node: Starred(
-                                                    ExprStarred {
-                                                        value: Attributed {
-                                                            range: 81..98,
-                                                            custom: (),
-                                                            node: Name(
-                                                                ExprName {
-                                                                    id: Identifier(
-                                                                        "indexes_to_select",
-                                                                    ),
-                                                                    ctx: Load,
-                                                                },
-                                                            ),
-                                                        },
-                                                        ctx: Load,
-                                                    },
+                                Starred(
+                                    ExprStarred {
+                                        range: 100..118,
+                                        value: Name(
+                                            ExprName {
+                                                range: 101..118,
+                                                id: Identifier(
+                                                    "indexes_to_select",
                                                 ),
+                                                ctx: Load,
                                             },
-                                            Attributed {
-                                                range: 100..118,
-                                                custom: (),
-                                                node: Starred(
-                                                    ExprStarred {
-                                                        value: Attributed {
-                                                            range: 101..118,
-                                                            custom: (),
-                                                            node: Name(
-                                                                ExprName {
-                                                                    id: Identifier(
-                                                                        "indexes_to_select",
-                                                                    ),
-                                                                    ctx: Load,
-                                                                },
-                                                            ),
-                                                        },
-                                                        ctx: Load,
-                                                    },
-                                                ),
-                                            },
-                                        ],
+                                        ),
                                         ctx: Load,
                                     },
                                 ),
-                            },
+                            ],
                             ctx: Load,
                         },
                     ),
+                    ctx: Load,
                 },
-            },
-        ),
-    },
-    Attributed {
-        range: 120..150,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+            ),
+        },
+    ),
+    Expr(
+        StmtExpr {
+            range: 120..150,
+            value: Subscript(
+                ExprSubscript {
                     range: 120..150,
-                    custom: (),
-                    node: Subscript(
-                        ExprSubscript {
-                            value: Attributed {
-                                range: 120..125,
-                                custom: (),
-                                node: Name(
-                                    ExprName {
-                                        id: Identifier(
-                                            "array",
+                    value: Name(
+                        ExprName {
+                            range: 120..125,
+                            id: Identifier(
+                                "array",
+                            ),
+                            ctx: Load,
+                        },
+                    ),
+                    slice: Tuple(
+                        ExprTuple {
+                            range: 126..149,
+                            elts: [
+                                Slice(
+                                    ExprSlice {
+                                        range: 126..129,
+                                        lower: Some(
+                                            Constant(
+                                                ExprConstant {
+                                                    range: 126..127,
+                                                    value: Int(
+                                                        3,
+                                                    ),
+                                                    kind: None,
+                                                },
+                                            ),
+                                        ),
+                                        upper: Some(
+                                            Constant(
+                                                ExprConstant {
+                                                    range: 128..129,
+                                                    value: Int(
+                                                        5,
+                                                    ),
+                                                    kind: None,
+                                                },
+                                            ),
+                                        ),
+                                        step: None,
+                                    },
+                                ),
+                                Starred(
+                                    ExprStarred {
+                                        range: 131..149,
+                                        value: Name(
+                                            ExprName {
+                                                range: 132..149,
+                                                id: Identifier(
+                                                    "indexes_to_select",
+                                                ),
+                                                ctx: Load,
+                                            },
                                         ),
                                         ctx: Load,
                                     },
                                 ),
-                            },
-                            slice: Attributed {
-                                range: 126..149,
-                                custom: (),
-                                node: Tuple(
-                                    ExprTuple {
-                                        elts: [
-                                            Attributed {
-                                                range: 126..129,
-                                                custom: (),
-                                                node: Slice(
-                                                    ExprSlice {
-                                                        lower: Some(
-                                                            Attributed {
-                                                                range: 126..127,
-                                                                custom: (),
-                                                                node: Constant(
-                                                                    ExprConstant {
-                                                                        value: Int(
-                                                                            3,
-                                                                        ),
-                                                                        kind: None,
-                                                                    },
-                                                                ),
-                                                            },
-                                                        ),
-                                                        upper: Some(
-                                                            Attributed {
-                                                                range: 128..129,
-                                                                custom: (),
-                                                                node: Constant(
-                                                                    ExprConstant {
-                                                                        value: Int(
-                                                                            5,
-                                                                        ),
-                                                                        kind: None,
-                                                                    },
-                                                                ),
-                                                            },
-                                                        ),
-                                                        step: None,
-                                                    },
-                                                ),
-                                            },
-                                            Attributed {
-                                                range: 131..149,
-                                                custom: (),
-                                                node: Starred(
-                                                    ExprStarred {
-                                                        value: Attributed {
-                                                            range: 132..149,
-                                                            custom: (),
-                                                            node: Name(
-                                                                ExprName {
-                                                                    id: Identifier(
-                                                                        "indexes_to_select",
-                                                                    ),
-                                                                    ctx: Load,
-                                                                },
-                                                            ),
-                                                        },
-                                                        ctx: Load,
-                                                    },
-                                                ),
-                                            },
-                                        ],
-                                        ctx: Load,
-                                    },
-                                ),
-                            },
+                            ],
                             ctx: Load,
                         },
                     ),
+                    ctx: Load,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__try.snap

@@ -3,322 +3,241 @@ source: parser/src/parser.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..134,
-        custom: (),
-        node: Try(
-            StmtTry {
-                body: [
-                    Attributed {
+    Try(
+        StmtTry {
+            range: 0..134,
+            body: [
+                Raise(
+                    StmtRaise {
                         range: 9..28,
-                        custom: (),
-                        node: Raise(
-                            StmtRaise {
-                                exc: Some(
-                                    Attributed {
-                                        range: 15..28,
-                                        custom: (),
-                                        node: Call(
-                                            ExprCall {
-                                                func: Attributed {
-                                                    range: 15..25,
-                                                    custom: (),
-                                                    node: Name(
-                                                        ExprName {
-                                                            id: Identifier(
-                                                                "ValueError",
-                                                            ),
-                                                            ctx: Load,
-                                                        },
-                                                    ),
-                                                },
-                                                args: [
-                                                    Attributed {
-                                                        range: 26..27,
-                                                        custom: (),
-                                                        node: Constant(
-                                                            ExprConstant {
-                                                                value: Int(
-                                                                    1,
-                                                                ),
-                                                                kind: None,
-                                                            },
-                                                        ),
-                                                    },
-                                                ],
-                                                keywords: [],
+                        exc: Some(
+                            Call(
+                                ExprCall {
+                                    range: 15..28,
+                                    func: Name(
+                                        ExprName {
+                                            range: 15..25,
+                                            id: Identifier(
+                                                "ValueError",
+                                            ),
+                                            ctx: Load,
+                                        },
+                                    ),
+                                    args: [
+                                        Constant(
+                                            ExprConstant {
+                                                range: 26..27,
+                                                value: Int(
+                                                    1,
+                                                ),
+                                                kind: None,
                                             },
                                         ),
-                                    },
-                                ),
-                                cause: None,
-                            },
+                                    ],
+                                    keywords: [],
+                                },
+                            ),
                         ),
+                        cause: None,
                     },
-                ],
-                handlers: [
-                    Attributed {
+                ),
+            ],
+            handlers: [
+                ExceptHandler(
+                    ExcepthandlerExceptHandler {
                         range: 29..82,
-                        custom: (),
-                        node: ExceptHandler(
-                            ExcepthandlerExceptHandler {
-                                type_: Some(
-                                    Attributed {
-                                        range: 36..45,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "TypeError",
-                                                ),
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    },
-                                ),
-                                name: Some(
-                                    Identifier(
-                                        "e",
+                        type_: Some(
+                            Name(
+                                ExprName {
+                                    range: 36..45,
+                                    id: Identifier(
+                                        "TypeError",
                                     ),
-                                ),
-                                body: [
-                                    Attributed {
-                                        range: 56..82,
-                                        custom: (),
-                                        node: Expr(
-                                            StmtExpr {
-                                                value: Attributed {
-                                                    range: 56..82,
-                                                    custom: (),
-                                                    node: Call(
-                                                        ExprCall {
-                                                            func: Attributed {
-                                                                range: 56..61,
-                                                                custom: (),
-                                                                node: Name(
-                                                                    ExprName {
-                                                                        id: Identifier(
-                                                                            "print",
-                                                                        ),
-                                                                        ctx: Load,
-                                                                    },
-                                                                ),
-                                                            },
-                                                            args: [
-                                                                Attributed {
+                                    ctx: Load,
+                                },
+                            ),
+                        ),
+                        name: Some(
+                            Identifier(
+                                "e",
+                            ),
+                        ),
+                        body: [
+                            Expr(
+                                StmtExpr {
+                                    range: 56..82,
+                                    value: Call(
+                                        ExprCall {
+                                            range: 56..82,
+                                            func: Name(
+                                                ExprName {
+                                                    range: 56..61,
+                                                    id: Identifier(
+                                                        "print",
+                                                    ),
+                                                    ctx: Load,
+                                                },
+                                            ),
+                                            args: [
+                                                JoinedStr(
+                                                    ExprJoinedStr {
+                                                        range: 62..81,
+                                                        values: [
+                                                            Constant(
+                                                                ExprConstant {
                                                                     range: 62..81,
-                                                                    custom: (),
-                                                                    node: JoinedStr(
-                                                                        ExprJoinedStr {
-                                                                            values: [
-                                                                                Attributed {
-                                                                                    range: 62..81,
-                                                                                    custom: (),
-                                                                                    node: Constant(
-                                                                                        ExprConstant {
-                                                                                            value: Str(
-                                                                                                "caught ",
-                                                                                            ),
-                                                                                            kind: None,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                Attributed {
-                                                                                    range: 62..81,
-                                                                                    custom: (),
-                                                                                    node: FormattedValue(
-                                                                                        ExprFormattedValue {
-                                                                                            value: Attributed {
-                                                                                                range: 72..79,
-                                                                                                custom: (),
-                                                                                                node: Call(
-                                                                                                    ExprCall {
-                                                                                                        func: Attributed {
-                                                                                                            range: 72..76,
-                                                                                                            custom: (),
-                                                                                                            node: Name(
-                                                                                                                ExprName {
-                                                                                                                    id: Identifier(
-                                                                                                                        "type",
-                                                                                                                    ),
-                                                                                                                    ctx: Load,
-                                                                                                                },
-                                                                                                            ),
-                                                                                                        },
-                                                                                                        args: [
-                                                                                                            Attributed {
-                                                                                                                range: 77..78,
-                                                                                                                custom: (),
-                                                                                                                node: Name(
-                                                                                                                    ExprName {
-                                                                                                                        id: Identifier(
-                                                                                                                            "e",
-                                                                                                                        ),
-                                                                                                                        ctx: Load,
-                                                                                                                    },
-                                                                                                                ),
-                                                                                                            },
-                                                                                                        ],
-                                                                                                        keywords: [],
-                                                                                                    },
-                                                                                                ),
-                                                                                            },
-                                                                                            conversion: Int(
-                                                                                                0,
-                                                                                            ),
-                                                                                            format_spec: None,
-                                                                                        },
+                                                                    value: Str(
+                                                                        "caught ",
+                                                                    ),
+                                                                    kind: None,
+                                                                },
+                                                            ),
+                                                            FormattedValue(
+                                                                ExprFormattedValue {
+                                                                    range: 62..81,
+                                                                    value: Call(
+                                                                        ExprCall {
+                                                                            range: 72..79,
+                                                                            func: Name(
+                                                                                ExprName {
+                                                                                    range: 72..76,
+                                                                                    id: Identifier(
+                                                                                        "type",
                                                                                     ),
+                                                                                    ctx: Load,
                                                                                 },
+                                                                            ),
+                                                                            args: [
+                                                                                Name(
+                                                                                    ExprName {
+                                                                                        range: 77..78,
+                                                                                        id: Identifier(
+                                                                                            "e",
+                                                                                        ),
+                                                                                        ctx: Load,
+                                                                                    },
+                                                                                ),
                                                                             ],
+                                                                            keywords: [],
                                                                         },
                                                                     ),
+                                                                    conversion: Int(
+                                                                        0,
+                                                                    ),
+                                                                    format_spec: None,
                                                                 },
-                                                            ],
-                                                            keywords: [],
-                                                        },
-                                                    ),
-                                                },
-                                            },
-                                        ),
-                                    },
-                                ],
-                            },
-                        ),
-                    },
-                    Attributed {
-                        range: 83..134,
-                        custom: (),
-                        node: ExceptHandler(
-                            ExcepthandlerExceptHandler {
-                                type_: Some(
-                                    Attributed {
-                                        range: 90..97,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "OSError",
+                                                            ),
+                                                        ],
+                                                    },
                                                 ),
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    },
-                                ),
-                                name: Some(
-                                    Identifier(
-                                        "e",
+                                            ],
+                                            keywords: [],
+                                        },
                                     ),
-                                ),
-                                body: [
-                                    Attributed {
-                                        range: 108..134,
-                                        custom: (),
-                                        node: Expr(
-                                            StmtExpr {
-                                                value: Attributed {
-                                                    range: 108..134,
-                                                    custom: (),
-                                                    node: Call(
-                                                        ExprCall {
-                                                            func: Attributed {
-                                                                range: 108..113,
-                                                                custom: (),
-                                                                node: Name(
-                                                                    ExprName {
-                                                                        id: Identifier(
-                                                                            "print",
-                                                                        ),
-                                                                        ctx: Load,
-                                                                    },
-                                                                ),
-                                                            },
-                                                            args: [
-                                                                Attributed {
+                                },
+                            ),
+                        ],
+                    },
+                ),
+                ExceptHandler(
+                    ExcepthandlerExceptHandler {
+                        range: 83..134,
+                        type_: Some(
+                            Name(
+                                ExprName {
+                                    range: 90..97,
+                                    id: Identifier(
+                                        "OSError",
+                                    ),
+                                    ctx: Load,
+                                },
+                            ),
+                        ),
+                        name: Some(
+                            Identifier(
+                                "e",
+                            ),
+                        ),
+                        body: [
+                            Expr(
+                                StmtExpr {
+                                    range: 108..134,
+                                    value: Call(
+                                        ExprCall {
+                                            range: 108..134,
+                                            func: Name(
+                                                ExprName {
+                                                    range: 108..113,
+                                                    id: Identifier(
+                                                        "print",
+                                                    ),
+                                                    ctx: Load,
+                                                },
+                                            ),
+                                            args: [
+                                                JoinedStr(
+                                                    ExprJoinedStr {
+                                                        range: 114..133,
+                                                        values: [
+                                                            Constant(
+                                                                ExprConstant {
                                                                     range: 114..133,
-                                                                    custom: (),
-                                                                    node: JoinedStr(
-                                                                        ExprJoinedStr {
-                                                                            values: [
-                                                                                Attributed {
-                                                                                    range: 114..133,
-                                                                                    custom: (),
-                                                                                    node: Constant(
-                                                                                        ExprConstant {
-                                                                                            value: Str(
-                                                                                                "caught ",
-                                                                                            ),
-                                                                                            kind: None,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                Attributed {
-                                                                                    range: 114..133,
-                                                                                    custom: (),
-                                                                                    node: FormattedValue(
-                                                                                        ExprFormattedValue {
-                                                                                            value: Attributed {
-                                                                                                range: 124..131,
-                                                                                                custom: (),
-                                                                                                node: Call(
-                                                                                                    ExprCall {
-                                                                                                        func: Attributed {
-                                                                                                            range: 124..128,
-                                                                                                            custom: (),
-                                                                                                            node: Name(
-                                                                                                                ExprName {
-                                                                                                                    id: Identifier(
-                                                                                                                        "type",
-                                                                                                                    ),
-                                                                                                                    ctx: Load,
-                                                                                                                },
-                                                                                                            ),
-                                                                                                        },
-                                                                                                        args: [
-                                                                                                            Attributed {
-                                                                                                                range: 129..130,
-                                                                                                                custom: (),
-                                                                                                                node: Name(
-                                                                                                                    ExprName {
-                                                                                                                        id: Identifier(
-                                                                                                                            "e",
-                                                                                                                        ),
-                                                                                                                        ctx: Load,
-                                                                                                                    },
-                                                                                                                ),
-                                                                                                            },
-                                                                                                        ],
-                                                                                                        keywords: [],
-                                                                                                    },
-                                                                                                ),
-                                                                                            },
-                                                                                            conversion: Int(
-                                                                                                0,
-                                                                                            ),
-                                                                                            format_spec: None,
-                                                                                        },
+                                                                    value: Str(
+                                                                        "caught ",
+                                                                    ),
+                                                                    kind: None,
+                                                                },
+                                                            ),
+                                                            FormattedValue(
+                                                                ExprFormattedValue {
+                                                                    range: 114..133,
+                                                                    value: Call(
+                                                                        ExprCall {
+                                                                            range: 124..131,
+                                                                            func: Name(
+                                                                                ExprName {
+                                                                                    range: 124..128,
+                                                                                    id: Identifier(
+                                                                                        "type",
                                                                                     ),
+                                                                                    ctx: Load,
                                                                                 },
+                                                                            ),
+                                                                            args: [
+                                                                                Name(
+                                                                                    ExprName {
+                                                                                        range: 129..130,
+                                                                                        id: Identifier(
+                                                                                            "e",
+                                                                                        ),
+                                                                                        ctx: Load,
+                                                                                    },
+                                                                                ),
                                                                             ],
+                                                                            keywords: [],
                                                                         },
                                                                     ),
+                                                                    conversion: Int(
+                                                                        0,
+                                                                    ),
+                                                                    format_spec: None,
                                                                 },
-                                                            ],
-                                                            keywords: [],
-                                                        },
-                                                    ),
-                                                },
-                                            },
-                                        ),
-                                    },
-                                ],
-                            },
-                        ),
+                                                            ),
+                                                        ],
+                                                    },
+                                                ),
+                                            ],
+                                            keywords: [],
+                                        },
+                                    ),
+                                },
+                            ),
+                        ],
                     },
-                ],
-                orelse: [],
-                finalbody: [],
-            },
-        ),
-    },
+                ),
+            ],
+            orelse: [],
+            finalbody: [],
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__try_star.snap

@@ -3,569 +3,425 @@ source: parser/src/parser.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..260,
-        custom: (),
-        node: TryStar(
-            StmtTryStar {
-                body: [
-                    Attributed {
+    TryStar(
+        StmtTryStar {
+            range: 0..260,
+            body: [
+                Raise(
+                    StmtRaise {
                         range: 9..98,
-                        custom: (),
-                        node: Raise(
-                            StmtRaise {
-                                exc: Some(
-                                    Attributed {
-                                        range: 15..98,
-                                        custom: (),
-                                        node: Call(
-                                            ExprCall {
-                                                func: Attributed {
-                                                    range: 15..29,
-                                                    custom: (),
-                                                    node: Name(
-                                                        ExprName {
-                                                            id: Identifier(
-                                                                "ExceptionGroup",
+                        exc: Some(
+                            Call(
+                                ExprCall {
+                                    range: 15..98,
+                                    func: Name(
+                                        ExprName {
+                                            range: 15..29,
+                                            id: Identifier(
+                                                "ExceptionGroup",
+                                            ),
+                                            ctx: Load,
+                                        },
+                                    ),
+                                    args: [
+                                        Constant(
+                                            ExprConstant {
+                                                range: 30..34,
+                                                value: Str(
+                                                    "eg",
+                                                ),
+                                                kind: None,
+                                            },
+                                        ),
+                                        List(
+                                            ExprList {
+                                                range: 44..97,
+                                                elts: [
+                                                    Call(
+                                                        ExprCall {
+                                                            range: 45..58,
+                                                            func: Name(
+                                                                ExprName {
+                                                                    range: 45..55,
+                                                                    id: Identifier(
+                                                                        "ValueError",
+                                                                    ),
+                                                                    ctx: Load,
+                                                                },
                                                             ),
-                                                            ctx: Load,
+                                                            args: [
+                                                                Constant(
+                                                                    ExprConstant {
+                                                                        range: 56..57,
+                                                                        value: Int(
+                                                                            1,
+                                                                        ),
+                                                                        kind: None,
+                                                                    },
+                                                                ),
+                                                            ],
+                                                            keywords: [],
                                                         },
                                                     ),
-                                                },
-                                                args: [
-                                                    Attributed {
-                                                        range: 30..34,
-                                                        custom: (),
-                                                        node: Constant(
-                                                            ExprConstant {
-                                                                value: Str(
-                                                                    "eg",
+                                                    Call(
+                                                        ExprCall {
+                                                            range: 60..72,
+                                                            func: Name(
+                                                                ExprName {
+                                                                    range: 60..69,
+                                                                    id: Identifier(
+                                                                        "TypeError",
+                                                                    ),
+                                                                    ctx: Load,
+                                                                },
+                                                            ),
+                                                            args: [
+                                                                Constant(
+                                                                    ExprConstant {
+                                                                        range: 70..71,
+                                                                        value: Int(
+                                                                            2,
+                                                                        ),
+                                                                        kind: None,
+                                                                    },
                                                                 ),
-                                                                kind: None,
-                                                            },
-                                                        ),
-                                                    },
-                                                    Attributed {
-                                                        range: 44..97,
-                                                        custom: (),
-                                                        node: List(
-                                                            ExprList {
-                                                                elts: [
-                                                                    Attributed {
-                                                                        range: 45..58,
-                                                                        custom: (),
-                                                                        node: Call(
-                                                                            ExprCall {
-                                                                                func: Attributed {
-                                                                                    range: 45..55,
-                                                                                    custom: (),
-                                                                                    node: Name(
-                                                                                        ExprName {
-                                                                                            id: Identifier(
-                                                                                                "ValueError",
-                                                                                            ),
-                                                                                            ctx: Load,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                args: [
-                                                                                    Attributed {
-                                                                                        range: 56..57,
-                                                                                        custom: (),
-                                                                                        node: Constant(
-                                                                                            ExprConstant {
-                                                                                                value: Int(
-                                                                                                    1,
-                                                                                                ),
-                                                                                                kind: None,
-                                                                                            },
-                                                                                        ),
-                                                                                    },
-                                                                                ],
-                                                                                keywords: [],
-                                                                            },
+                                                            ],
+                                                            keywords: [],
+                                                        },
+                                                    ),
+                                                    Call(
+                                                        ExprCall {
+                                                            range: 74..84,
+                                                            func: Name(
+                                                                ExprName {
+                                                                    range: 74..81,
+                                                                    id: Identifier(
+                                                                        "OSError",
+                                                                    ),
+                                                                    ctx: Load,
+                                                                },
+                                                            ),
+                                                            args: [
+                                                                Constant(
+                                                                    ExprConstant {
+                                                                        range: 82..83,
+                                                                        value: Int(
+                                                                            3,
                                                                         ),
+                                                                        kind: None,
                                                                     },
-                                                                    Attributed {
-                                                                        range: 60..72,
-                                                                        custom: (),
-                                                                        node: Call(
-                                                                            ExprCall {
-                                                                                func: Attributed {
-                                                                                    range: 60..69,
-                                                                                    custom: (),
-                                                                                    node: Name(
-                                                                                        ExprName {
-                                                                                            id: Identifier(
-                                                                                                "TypeError",
-                                                                                            ),
-                                                                                            ctx: Load,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                args: [
-                                                                                    Attributed {
-                                                                                        range: 70..71,
-                                                                                        custom: (),
-                                                                                        node: Constant(
-                                                                                            ExprConstant {
-                                                                                                value: Int(
-                                                                                                    2,
-                                                                                                ),
-                                                                                                kind: None,
-                                                                                            },
-                                                                                        ),
-                                                                                    },
-                                                                                ],
-                                                                                keywords: [],
-                                                                            },
+                                                                ),
+                                                            ],
+                                                            keywords: [],
+                                                        },
+                                                    ),
+                                                    Call(
+                                                        ExprCall {
+                                                            range: 86..96,
+                                                            func: Name(
+                                                                ExprName {
+                                                                    range: 86..93,
+                                                                    id: Identifier(
+                                                                        "OSError",
+                                                                    ),
+                                                                    ctx: Load,
+                                                                },
+                                                            ),
+                                                            args: [
+                                                                Constant(
+                                                                    ExprConstant {
+                                                                        range: 94..95,
+                                                                        value: Int(
+                                                                            4,
                                                                         ),
+                                                                        kind: None,
                                                                     },
-                                                                    Attributed {
-                                                                        range: 74..84,
-                                                                        custom: (),
-                                                                        node: Call(
-                                                                            ExprCall {
-                                                                                func: Attributed {
-                                                                                    range: 74..81,
-                                                                                    custom: (),
-                                                                                    node: Name(
-                                                                                        ExprName {
-                                                                                            id: Identifier(
-                                                                                                "OSError",
-                                                                                            ),
-                                                                                            ctx: Load,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                args: [
-                                                                                    Attributed {
-                                                                                        range: 82..83,
-                                                                                        custom: (),
-                                                                                        node: Constant(
-                                                                                            ExprConstant {
-                                                                                                value: Int(
-                                                                                                    3,
-                                                                                                ),
-                                                                                                kind: None,
-                                                                                            },
-                                                                                        ),
-                                                                                    },
-                                                                                ],
-                                                                                keywords: [],
-                                                                            },
-                                                                        ),
-                                                                    },
-                                                                    Attributed {
-                                                                        range: 86..96,
-                                                                        custom: (),
-                                                                        node: Call(
-                                                                            ExprCall {
-                                                                                func: Attributed {
-                                                                                    range: 86..93,
-                                                                                    custom: (),
-                                                                                    node: Name(
-                                                                                        ExprName {
-                                                                                            id: Identifier(
-                                                                                                "OSError",
-                                                                                            ),
-                                                                                            ctx: Load,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                args: [
-                                                                                    Attributed {
-                                                                                        range: 94..95,
-                                                                                        custom: (),
-                                                                                        node: Constant(
-                                                                                            ExprConstant {
-                                                                                                value: Int(
-                                                                                                    4,
-                                                                                                ),
-                                                                                                kind: None,
-                                                                                            },
-                                                                                        ),
-                                                                                    },
-                                                                                ],
-                                                                                keywords: [],
-                                                                            },
-                                                                        ),
-                                                                    },
-                                                                ],
-                                                                ctx: Load,
-                                                            },
-                                                        ),
-                                                    },
+                                                                ),
+                                                            ],
+                                                            keywords: [],
+                                                        },
+                                                    ),
                                                 ],
-                                                keywords: [],
+                                                ctx: Load,
                                             },
                                         ),
-                                    },
-                                ),
-                                cause: None,
-                            },
+                                    ],
+                                    keywords: [],
+                                },
+                            ),
                         ),
+                        cause: None,
                     },
-                ],
-                handlers: [
-                    Attributed {
+                ),
+            ],
+            handlers: [
+                ExceptHandler(
+                    ExcepthandlerExceptHandler {
                         range: 99..180,
-                        custom: (),
-                        node: ExceptHandler(
-                            ExcepthandlerExceptHandler {
-                                type_: Some(
-                                    Attributed {
-                                        range: 107..116,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "TypeError",
-                                                ),
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    },
-                                ),
-                                name: Some(
-                                    Identifier(
-                                        "e",
+                        type_: Some(
+                            Name(
+                                ExprName {
+                                    range: 107..116,
+                                    id: Identifier(
+                                        "TypeError",
                                     ),
-                                ),
-                                body: [
-                                    Attributed {
-                                        range: 127..180,
-                                        custom: (),
-                                        node: Expr(
-                                            StmtExpr {
-                                                value: Attributed {
-                                                    range: 127..180,
-                                                    custom: (),
-                                                    node: Call(
-                                                        ExprCall {
-                                                            func: Attributed {
-                                                                range: 127..132,
-                                                                custom: (),
-                                                                node: Name(
-                                                                    ExprName {
-                                                                        id: Identifier(
-                                                                            "print",
-                                                                        ),
-                                                                        ctx: Load,
-                                                                    },
-                                                                ),
-                                                            },
-                                                            args: [
-                                                                Attributed {
+                                    ctx: Load,
+                                },
+                            ),
+                        ),
+                        name: Some(
+                            Identifier(
+                                "e",
+                            ),
+                        ),
+                        body: [
+                            Expr(
+                                StmtExpr {
+                                    range: 127..180,
+                                    value: Call(
+                                        ExprCall {
+                                            range: 127..180,
+                                            func: Name(
+                                                ExprName {
+                                                    range: 127..132,
+                                                    id: Identifier(
+                                                        "print",
+                                                    ),
+                                                    ctx: Load,
+                                                },
+                                            ),
+                                            args: [
+                                                JoinedStr(
+                                                    ExprJoinedStr {
+                                                        range: 133..179,
+                                                        values: [
+                                                            Constant(
+                                                                ExprConstant {
                                                                     range: 133..179,
-                                                                    custom: (),
-                                                                    node: JoinedStr(
-                                                                        ExprJoinedStr {
-                                                                            values: [
-                                                                                Attributed {
-                                                                                    range: 133..179,
-                                                                                    custom: (),
-                                                                                    node: Constant(
-                                                                                        ExprConstant {
-                                                                                            value: Str(
-                                                                                                "caught ",
-                                                                                            ),
-                                                                                            kind: None,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                Attributed {
-                                                                                    range: 133..179,
-                                                                                    custom: (),
-                                                                                    node: FormattedValue(
-                                                                                        ExprFormattedValue {
-                                                                                            value: Attributed {
-                                                                                                range: 143..150,
-                                                                                                custom: (),
-                                                                                                node: Call(
-                                                                                                    ExprCall {
-                                                                                                        func: Attributed {
-                                                                                                            range: 143..147,
-                                                                                                            custom: (),
-                                                                                                            node: Name(
-                                                                                                                ExprName {
-                                                                                                                    id: Identifier(
-                                                                                                                        "type",
-                                                                                                                    ),
-                                                                                                                    ctx: Load,
-                                                                                                                },
-                                                                                                            ),
-                                                                                                        },
-                                                                                                        args: [
-                                                                                                            Attributed {
-                                                                                                                range: 148..149,
-                                                                                                                custom: (),
-                                                                                                                node: Name(
-                                                                                                                    ExprName {
-                                                                                                                        id: Identifier(
-                                                                                                                            "e",
-                                                                                                                        ),
-                                                                                                                        ctx: Load,
-                                                                                                                    },
-                                                                                                                ),
-                                                                                                            },
-                                                                                                        ],
-                                                                                                        keywords: [],
-                                                                                                    },
-                                                                                                ),
-                                                                                            },
-                                                                                            conversion: Int(
-                                                                                                0,
-                                                                                            ),
-                                                                                            format_spec: None,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                Attributed {
-                                                                                    range: 133..179,
-                                                                                    custom: (),
-                                                                                    node: Constant(
-                                                                                        ExprConstant {
-                                                                                            value: Str(
-                                                                                                " with nested ",
-                                                                                            ),
-                                                                                            kind: None,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                Attributed {
-                                                                                    range: 133..179,
-                                                                                    custom: (),
-                                                                                    node: FormattedValue(
-                                                                                        ExprFormattedValue {
-                                                                                            value: Attributed {
-                                                                                                range: 165..177,
-                                                                                                custom: (),
-                                                                                                node: Attribute(
-                                                                                                    ExprAttribute {
-                                                                                                        value: Attributed {
-                                                                                                            range: 165..166,
-                                                                                                            custom: (),
-                                                                                                            node: Name(
-                                                                                                                ExprName {
-                                                                                                                    id: Identifier(
-                                                                                                                        "e",
-                                                                                                                    ),
-                                                                                                                    ctx: Load,
-                                                                                                                },
-                                                                                                            ),
-                                                                                                        },
-                                                                                                        attr: Identifier(
-                                                                                                            "exceptions",
-                                                                                                        ),
-                                                                                                        ctx: Load,
-                                                                                                    },
-                                                                                                ),
-                                                                                            },
-                                                                                            conversion: Int(
-                                                                                                0,
-                                                                                            ),
-                                                                                            format_spec: None,
-                                                                                        },
+                                                                    value: Str(
+                                                                        "caught ",
+                                                                    ),
+                                                                    kind: None,
+                                                                },
+                                                            ),
+                                                            FormattedValue(
+                                                                ExprFormattedValue {
+                                                                    range: 133..179,
+                                                                    value: Call(
+                                                                        ExprCall {
+                                                                            range: 143..150,
+                                                                            func: Name(
+                                                                                ExprName {
+                                                                                    range: 143..147,
+                                                                                    id: Identifier(
+                                                                                        "type",
                                                                                     ),
+                                                                                    ctx: Load,
                                                                                 },
+                                                                            ),
+                                                                            args: [
+                                                                                Name(
+                                                                                    ExprName {
+                                                                                        range: 148..149,
+                                                                                        id: Identifier(
+                                                                                            "e",
+                                                                                        ),
+                                                                                        ctx: Load,
+                                                                                    },
+                                                                                ),
                                                                             ],
+                                                                            keywords: [],
                                                                         },
                                                                     ),
+                                                                    conversion: Int(
+                                                                        0,
+                                                                    ),
+                                                                    format_spec: None,
                                                                 },
-                                                            ],
-                                                            keywords: [],
-                                                        },
-                                                    ),
-                                                },
-                                            },
-                                        ),
-                                    },
-                                ],
-                            },
-                        ),
-                    },
-                    Attributed {
-                        range: 181..260,
-                        custom: (),
-                        node: ExceptHandler(
-                            ExcepthandlerExceptHandler {
-                                type_: Some(
-                                    Attributed {
-                                        range: 189..196,
-                                        custom: (),
-                                        node: Name(
-                                            ExprName {
-                                                id: Identifier(
-                                                    "OSError",
+                                                            ),
+                                                            Constant(
+                                                                ExprConstant {
+                                                                    range: 133..179,
+                                                                    value: Str(
+                                                                        " with nested ",
+                                                                    ),
+                                                                    kind: None,
+                                                                },
+                                                            ),
+                                                            FormattedValue(
+                                                                ExprFormattedValue {
+                                                                    range: 133..179,
+                                                                    value: Attribute(
+                                                                        ExprAttribute {
+                                                                            range: 165..177,
+                                                                            value: Name(
+                                                                                ExprName {
+                                                                                    range: 165..166,
+                                                                                    id: Identifier(
+                                                                                        "e",
+                                                                                    ),
+                                                                                    ctx: Load,
+                                                                                },
+                                                                            ),
+                                                                            attr: Identifier(
+                                                                                "exceptions",
+                                                                            ),
+                                                                            ctx: Load,
+                                                                        },
+                                                                    ),
+                                                                    conversion: Int(
+                                                                        0,
+                                                                    ),
+                                                                    format_spec: None,
+                                                                },
+                                                            ),
+                                                        ],
+                                                    },
                                                 ),
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    },
-                                ),
-                                name: Some(
-                                    Identifier(
-                                        "e",
+                                            ],
+                                            keywords: [],
+                                        },
                                     ),
-                                ),
-                                body: [
-                                    Attributed {
-                                        range: 207..260,
-                                        custom: (),
-                                        node: Expr(
-                                            StmtExpr {
-                                                value: Attributed {
-                                                    range: 207..260,
-                                                    custom: (),
-                                                    node: Call(
-                                                        ExprCall {
-                                                            func: Attributed {
-                                                                range: 207..212,
-                                                                custom: (),
-                                                                node: Name(
-                                                                    ExprName {
-                                                                        id: Identifier(
-                                                                            "print",
-                                                                        ),
-                                                                        ctx: Load,
-                                                                    },
-                                                                ),
-                                                            },
-                                                            args: [
-                                                                Attributed {
+                                },
+                            ),
+                        ],
+                    },
+                ),
+                ExceptHandler(
+                    ExcepthandlerExceptHandler {
+                        range: 181..260,
+                        type_: Some(
+                            Name(
+                                ExprName {
+                                    range: 189..196,
+                                    id: Identifier(
+                                        "OSError",
+                                    ),
+                                    ctx: Load,
+                                },
+                            ),
+                        ),
+                        name: Some(
+                            Identifier(
+                                "e",
+                            ),
+                        ),
+                        body: [
+                            Expr(
+                                StmtExpr {
+                                    range: 207..260,
+                                    value: Call(
+                                        ExprCall {
+                                            range: 207..260,
+                                            func: Name(
+                                                ExprName {
+                                                    range: 207..212,
+                                                    id: Identifier(
+                                                        "print",
+                                                    ),
+                                                    ctx: Load,
+                                                },
+                                            ),
+                                            args: [
+                                                JoinedStr(
+                                                    ExprJoinedStr {
+                                                        range: 213..259,
+                                                        values: [
+                                                            Constant(
+                                                                ExprConstant {
                                                                     range: 213..259,
-                                                                    custom: (),
-                                                                    node: JoinedStr(
-                                                                        ExprJoinedStr {
-                                                                            values: [
-                                                                                Attributed {
-                                                                                    range: 213..259,
-                                                                                    custom: (),
-                                                                                    node: Constant(
-                                                                                        ExprConstant {
-                                                                                            value: Str(
-                                                                                                "caught ",
-                                                                                            ),
-                                                                                            kind: None,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                Attributed {
-                                                                                    range: 213..259,
-                                                                                    custom: (),
-                                                                                    node: FormattedValue(
-                                                                                        ExprFormattedValue {
-                                                                                            value: Attributed {
-                                                                                                range: 223..230,
-                                                                                                custom: (),
-                                                                                                node: Call(
-                                                                                                    ExprCall {
-                                                                                                        func: Attributed {
-                                                                                                            range: 223..227,
-                                                                                                            custom: (),
-                                                                                                            node: Name(
-                                                                                                                ExprName {
-                                                                                                                    id: Identifier(
-                                                                                                                        "type",
-                                                                                                                    ),
-                                                                                                                    ctx: Load,
-                                                                                                                },
-                                                                                                            ),
-                                                                                                        },
-                                                                                                        args: [
-                                                                                                            Attributed {
-                                                                                                                range: 228..229,
-                                                                                                                custom: (),
-                                                                                                                node: Name(
-                                                                                                                    ExprName {
-                                                                                                                        id: Identifier(
-                                                                                                                            "e",
-                                                                                                                        ),
-                                                                                                                        ctx: Load,
-                                                                                                                    },
-                                                                                                                ),
-                                                                                                            },
-                                                                                                        ],
-                                                                                                        keywords: [],
-                                                                                                    },
-                                                                                                ),
-                                                                                            },
-                                                                                            conversion: Int(
-                                                                                                0,
-                                                                                            ),
-                                                                                            format_spec: None,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                Attributed {
-                                                                                    range: 213..259,
-                                                                                    custom: (),
-                                                                                    node: Constant(
-                                                                                        ExprConstant {
-                                                                                            value: Str(
-                                                                                                " with nested ",
-                                                                                            ),
-                                                                                            kind: None,
-                                                                                        },
-                                                                                    ),
-                                                                                },
-                                                                                Attributed {
-                                                                                    range: 213..259,
-                                                                                    custom: (),
-                                                                                    node: FormattedValue(
-                                                                                        ExprFormattedValue {
-                                                                                            value: Attributed {
-                                                                                                range: 245..257,
-                                                                                                custom: (),
-                                                                                                node: Attribute(
-                                                                                                    ExprAttribute {
-                                                                                                        value: Attributed {
-                                                                                                            range: 245..246,
-                                                                                                            custom: (),
-                                                                                                            node: Name(
-                                                                                                                ExprName {
-                                                                                                                    id: Identifier(
-                                                                                                                        "e",
-                                                                                                                    ),
-                                                                                                                    ctx: Load,
-                                                                                                                },
-                                                                                                            ),
-                                                                                                        },
-                                                                                                        attr: Identifier(
-                                                                                                            "exceptions",
-                                                                                                        ),
-                                                                                                        ctx: Load,
-                                                                                                    },
-                                                                                                ),
-                                                                                            },
-                                                                                            conversion: Int(
-                                                                                                0,
-                                                                                            ),
-                                                                                            format_spec: None,
-                                                                                        },
+                                                                    value: Str(
+                                                                        "caught ",
+                                                                    ),
+                                                                    kind: None,
+                                                                },
+                                                            ),
+                                                            FormattedValue(
+                                                                ExprFormattedValue {
+                                                                    range: 213..259,
+                                                                    value: Call(
+                                                                        ExprCall {
+                                                                            range: 223..230,
+                                                                            func: Name(
+                                                                                ExprName {
+                                                                                    range: 223..227,
+                                                                                    id: Identifier(
+                                                                                        "type",
                                                                                     ),
+                                                                                    ctx: Load,
                                                                                 },
+                                                                            ),
+                                                                            args: [
+                                                                                Name(
+                                                                                    ExprName {
+                                                                                        range: 228..229,
+                                                                                        id: Identifier(
+                                                                                            "e",
+                                                                                        ),
+                                                                                        ctx: Load,
+                                                                                    },
+                                                                                ),
                                                                             ],
+                                                                            keywords: [],
                                                                         },
                                                                     ),
+                                                                    conversion: Int(
+                                                                        0,
+                                                                    ),
+                                                                    format_spec: None,
                                                                 },
-                                                            ],
-                                                            keywords: [],
-                                                        },
-                                                    ),
-                                                },
-                                            },
-                                        ),
-                                    },
-                                ],
-                            },
-                        ),
+                                                            ),
+                                                            Constant(
+                                                                ExprConstant {
+                                                                    range: 213..259,
+                                                                    value: Str(
+                                                                        " with nested ",
+                                                                    ),
+                                                                    kind: None,
+                                                                },
+                                                            ),
+                                                            FormattedValue(
+                                                                ExprFormattedValue {
+                                                                    range: 213..259,
+                                                                    value: Attribute(
+                                                                        ExprAttribute {
+                                                                            range: 245..257,
+                                                                            value: Name(
+                                                                                ExprName {
+                                                                                    range: 245..246,
+                                                                                    id: Identifier(
+                                                                                        "e",
+                                                                                    ),
+                                                                                    ctx: Load,
+                                                                                },
+                                                                            ),
+                                                                            attr: Identifier(
+                                                                                "exceptions",
+                                                                            ),
+                                                                            ctx: Load,
+                                                                        },
+                                                                    ),
+                                                                    conversion: Int(
+                                                                        0,
+                                                                    ),
+                                                                    format_spec: None,
+                                                                },
+                                                            ),
+                                                        ],
+                                                    },
+                                                ),
+                                            ],
+                                            keywords: [],
+                                        },
+                                    ),
+                                },
+                            ),
+                        ],
                     },
-                ],
-                orelse: [],
-                finalbody: [],
-            },
-        ),
-    },
+                ),
+            ],
+            orelse: [],
+            finalbody: [],
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap

@@ -3,124 +3,95 @@ source: parser/src/parser.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 1..49,
-        custom: (),
-        node: FunctionDef(
-            StmtFunctionDef {
-                name: Identifier(
-                    "args_to_tuple",
-                ),
-                args: Arguments {
-                    posonlyargs: [],
-                    args: [],
-                    vararg: Some(
-                        Attributed {
-                            range: 20..29,
-                            custom: (),
-                            node: ArgData {
-                                arg: Identifier(
-                                    "args",
-                                ),
-                                annotation: Some(
-                                    Attributed {
-                                        range: 26..29,
-                                        custom: (),
-                                        node: Starred(
-                                            ExprStarred {
-                                                value: Attributed {
-                                                    range: 27..29,
-                                                    custom: (),
-                                                    node: Name(
-                                                        ExprName {
-                                                            id: Identifier(
-                                                                "Ts",
-                                                            ),
-                                                            ctx: Load,
-                                                        },
-                                                    ),
-                                                },
-                                                ctx: Load,
-                                            },
-                                        ),
-                                    },
-                                ),
-                                type_comment: None,
-                            },
-                        },
-                    ),
-                    kwonlyargs: [],
-                    kw_defaults: [],
-                    kwarg: None,
-                    defaults: [],
-                },
-                body: [
-                    Attributed {
-                        range: 46..49,
-                        custom: (),
-                        node: Expr(
-                            StmtExpr {
-                                value: Attributed {
-                                    range: 46..49,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Ellipsis,
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                            },
+    FunctionDef(
+        StmtFunctionDef {
+            range: 1..49,
+            name: Identifier(
+                "args_to_tuple",
+            ),
+            args: Arguments {
+                posonlyargs: [],
+                args: [],
+                vararg: Some(
+                    Arg {
+                        arg: Identifier(
+                            "args",
                         ),
-                    },
-                ],
-                decorator_list: [],
-                returns: Some(
-                    Attributed {
-                        range: 34..44,
-                        custom: (),
-                        node: Subscript(
-                            ExprSubscript {
-                                value: Attributed {
-                                    range: 34..39,
-                                    custom: (),
-                                    node: Name(
+                        annotation: Some(
+                            Starred(
+                                ExprStarred {
+                                    range: 26..29,
+                                    value: Name(
                                         ExprName {
+                                            range: 27..29,
                                             id: Identifier(
-                                                "Tuple",
+                                                "Ts",
                                             ),
                                             ctx: Load,
                                         },
                                     ),
+                                    ctx: Load,
                                 },
-                                slice: Attributed {
-                                    range: 40..43,
-                                    custom: (),
-                                    node: Starred(
-                                        ExprStarred {
-                                            value: Attributed {
-                                                range: 41..43,
-                                                custom: (),
-                                                node: Name(
-                                                    ExprName {
-                                                        id: Identifier(
-                                                            "Ts",
-                                                        ),
-                                                        ctx: Load,
-                                                    },
-                                                ),
-                                            },
-                                            ctx: Load,
-                                        },
-                                    ),
-                                },
-                                ctx: Load,
+                            ),
+                        ),
+                        type_comment: None,
+                        range: 20..29,
+                    },
+                ),
+                kwonlyargs: [],
+                kw_defaults: [],
+                kwarg: None,
+                defaults: [],
+                range: (),
+            },
+            body: [
+                Expr(
+                    StmtExpr {
+                        range: 46..49,
+                        value: Constant(
+                            ExprConstant {
+                                range: 46..49,
+                                value: Ellipsis,
+                                kind: None,
                             },
                         ),
                     },
                 ),
-                type_comment: None,
-            },
-        ),
-    },
+            ],
+            decorator_list: [],
+            returns: Some(
+                Subscript(
+                    ExprSubscript {
+                        range: 34..44,
+                        value: Name(
+                            ExprName {
+                                range: 34..39,
+                                id: Identifier(
+                                    "Tuple",
+                                ),
+                                ctx: Load,
+                            },
+                        ),
+                        slice: Starred(
+                            ExprStarred {
+                                range: 40..43,
+                                value: Name(
+                                    ExprName {
+                                        range: 41..43,
+                                        id: Identifier(
+                                            "Ts",
+                                        ),
+                                        ctx: Load,
+                                    },
+                                ),
+                                ctx: Load,
+                            },
+                        ),
+                        ctx: Load,
+                    },
+                ),
+            ),
+            type_comment: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__backspace_alias.snap

@@ -3,24 +3,18 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..15,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..15,
+            value: Constant(
+                ExprConstant {
                     range: 0..15,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Str(
-                                "\u{8}",
-                            ),
-                            kind: None,
-                        },
+                    value: Str(
+                        "\u{8}",
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__bell_alias.snap

@@ -3,24 +3,18 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..9,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..9,
+            value: Constant(
+                ExprConstant {
                     range: 0..9,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Str(
-                                "\u{7}",
-                            ),
-                            kind: None,
-                        },
+                    value: Str(
+                        "\u{7}",
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__carriage_return_alias.snap

@@ -3,24 +3,18 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..21,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..21,
+            value: Constant(
+                ExprConstant {
                     range: 0..21,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Str(
-                                "\r",
-                            ),
-                            kind: None,
-                        },
+                    value: Str(
+                        "\r",
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__character_tabulation_with_justification_alias.snap

@@ -3,24 +3,18 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..45,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..45,
+            value: Constant(
+                ExprConstant {
                     range: 0..45,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Str(
-                                "\u{89}",
-                            ),
-                            kind: None,
-                        },
+                    value: Str(
+                        "\u{89}",
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__delete_alias.snap

@@ -3,24 +3,18 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..12,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..12,
+            value: Constant(
+                ExprConstant {
                     range: 0..12,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Str(
-                                "\u{7f}",
-                            ),
-                            kind: None,
-                        },
+                    value: Str(
+                        "\u{7f}",
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__double_quoted_byte.snap

@@ -3,281 +3,275 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..738,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..738,
+            value: Constant(
+                ExprConstant {
                     range: 0..738,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Bytes(
-                                [
-                                    0,
-                                    1,
-                                    2,
-                                    3,
-                                    4,
-                                    5,
-                                    6,
-                                    7,
-                                    8,
-                                    9,
-                                    10,
-                                    11,
-                                    12,
-                                    13,
-                                    14,
-                                    15,
-                                    16,
-                                    17,
-                                    18,
-                                    19,
-                                    20,
-                                    21,
-                                    22,
-                                    23,
-                                    24,
-                                    25,
-                                    26,
-                                    27,
-                                    28,
-                                    29,
-                                    30,
-                                    31,
-                                    32,
-                                    33,
-                                    34,
-                                    35,
-                                    36,
-                                    37,
-                                    38,
-                                    39,
-                                    40,
-                                    41,
-                                    42,
-                                    43,
-                                    44,
-                                    45,
-                                    46,
-                                    47,
-                                    48,
-                                    49,
-                                    50,
-                                    51,
-                                    52,
-                                    53,
-                                    54,
-                                    55,
-                                    56,
-                                    57,
-                                    58,
-                                    59,
-                                    60,
-                                    61,
-                                    62,
-                                    63,
-                                    64,
-                                    65,
-                                    66,
-                                    67,
-                                    68,
-                                    69,
-                                    70,
-                                    71,
-                                    72,
-                                    73,
-                                    74,
-                                    75,
-                                    76,
-                                    77,
-                                    78,
-                                    79,
-                                    80,
-                                    81,
-                                    82,
-                                    83,
-                                    84,
-                                    85,
-                                    86,
-                                    87,
-                                    88,
-                                    89,
-                                    90,
-                                    91,
-                                    92,
-                                    93,
-                                    94,
-                                    95,
-                                    96,
-                                    97,
-                                    98,
-                                    99,
-                                    100,
-                                    101,
-                                    102,
-                                    103,
-                                    104,
-                                    105,
-                                    106,
-                                    107,
-                                    108,
-                                    109,
-                                    110,
-                                    111,
-                                    112,
-                                    113,
-                                    114,
-                                    115,
-                                    116,
-                                    117,
-                                    118,
-                                    119,
-                                    120,
-                                    121,
-                                    122,
-                                    123,
-                                    124,
-                                    125,
-                                    126,
-                                    127,
-                                    128,
-                                    129,
-                                    130,
-                                    131,
-                                    132,
-                                    133,
-                                    134,
-                                    135,
-                                    136,
-                                    137,
-                                    138,
-                                    139,
-                                    140,
-                                    141,
-                                    142,
-                                    143,
-                                    144,
-                                    145,
-                                    146,
-                                    147,
-                                    148,
-                                    149,
-                                    150,
-                                    151,
-                                    152,
-                                    153,
-                                    154,
-                                    155,
-                                    156,
-                                    157,
-                                    158,
-                                    159,
-                                    160,
-                                    161,
-                                    162,
-                                    163,
-                                    164,
-                                    165,
-                                    166,
-                                    167,
-                                    168,
-                                    169,
-                                    170,
-                                    171,
-                                    172,
-                                    173,
-                                    174,
-                                    175,
-                                    176,
-                                    177,
-                                    178,
-                                    179,
-                                    180,
-                                    181,
-                                    182,
-                                    183,
-                                    184,
-                                    185,
-                                    186,
-                                    187,
-                                    188,
-                                    189,
-                                    190,
-                                    191,
-                                    192,
-                                    193,
-                                    194,
-                                    195,
-                                    196,
-                                    197,
-                                    198,
-                                    199,
-                                    200,
-                                    201,
-                                    202,
-                                    203,
-                                    204,
-                                    205,
-                                    206,
-                                    207,
-                                    208,
-                                    209,
-                                    210,
-                                    211,
-                                    212,
-                                    213,
-                                    214,
-                                    215,
-                                    216,
-                                    217,
-                                    218,
-                                    219,
-                                    220,
-                                    221,
-                                    222,
-                                    223,
-                                    224,
-                                    225,
-                                    226,
-                                    227,
-                                    228,
-                                    229,
-                                    230,
-                                    231,
-                                    232,
-                                    233,
-                                    234,
-                                    235,
-                                    236,
-                                    237,
-                                    238,
-                                    239,
-                                    240,
-                                    241,
-                                    242,
-                                    243,
-                                    244,
-                                    245,
-                                    246,
-                                    247,
-                                    248,
-                                    249,
-                                    250,
-                                    251,
-                                    252,
-                                    253,
-                                    254,
-                                    255,
-                                ],
-                            ),
-                            kind: None,
-                        },
+                    value: Bytes(
+                        [
+                            0,
+                            1,
+                            2,
+                            3,
+                            4,
+                            5,
+                            6,
+                            7,
+                            8,
+                            9,
+                            10,
+                            11,
+                            12,
+                            13,
+                            14,
+                            15,
+                            16,
+                            17,
+                            18,
+                            19,
+                            20,
+                            21,
+                            22,
+                            23,
+                            24,
+                            25,
+                            26,
+                            27,
+                            28,
+                            29,
+                            30,
+                            31,
+                            32,
+                            33,
+                            34,
+                            35,
+                            36,
+                            37,
+                            38,
+                            39,
+                            40,
+                            41,
+                            42,
+                            43,
+                            44,
+                            45,
+                            46,
+                            47,
+                            48,
+                            49,
+                            50,
+                            51,
+                            52,
+                            53,
+                            54,
+                            55,
+                            56,
+                            57,
+                            58,
+                            59,
+                            60,
+                            61,
+                            62,
+                            63,
+                            64,
+                            65,
+                            66,
+                            67,
+                            68,
+                            69,
+                            70,
+                            71,
+                            72,
+                            73,
+                            74,
+                            75,
+                            76,
+                            77,
+                            78,
+                            79,
+                            80,
+                            81,
+                            82,
+                            83,
+                            84,
+                            85,
+                            86,
+                            87,
+                            88,
+                            89,
+                            90,
+                            91,
+                            92,
+                            93,
+                            94,
+                            95,
+                            96,
+                            97,
+                            98,
+                            99,
+                            100,
+                            101,
+                            102,
+                            103,
+                            104,
+                            105,
+                            106,
+                            107,
+                            108,
+                            109,
+                            110,
+                            111,
+                            112,
+                            113,
+                            114,
+                            115,
+                            116,
+                            117,
+                            118,
+                            119,
+                            120,
+                            121,
+                            122,
+                            123,
+                            124,
+                            125,
+                            126,
+                            127,
+                            128,
+                            129,
+                            130,
+                            131,
+                            132,
+                            133,
+                            134,
+                            135,
+                            136,
+                            137,
+                            138,
+                            139,
+                            140,
+                            141,
+                            142,
+                            143,
+                            144,
+                            145,
+                            146,
+                            147,
+                            148,
+                            149,
+                            150,
+                            151,
+                            152,
+                            153,
+                            154,
+                            155,
+                            156,
+                            157,
+                            158,
+                            159,
+                            160,
+                            161,
+                            162,
+                            163,
+                            164,
+                            165,
+                            166,
+                            167,
+                            168,
+                            169,
+                            170,
+                            171,
+                            172,
+                            173,
+                            174,
+                            175,
+                            176,
+                            177,
+                            178,
+                            179,
+                            180,
+                            181,
+                            182,
+                            183,
+                            184,
+                            185,
+                            186,
+                            187,
+                            188,
+                            189,
+                            190,
+                            191,
+                            192,
+                            193,
+                            194,
+                            195,
+                            196,
+                            197,
+                            198,
+                            199,
+                            200,
+                            201,
+                            202,
+                            203,
+                            204,
+                            205,
+                            206,
+                            207,
+                            208,
+                            209,
+                            210,
+                            211,
+                            212,
+                            213,
+                            214,
+                            215,
+                            216,
+                            217,
+                            218,
+                            219,
+                            220,
+                            221,
+                            222,
+                            223,
+                            224,
+                            225,
+                            226,
+                            227,
+                            228,
+                            229,
+                            230,
+                            231,
+                            232,
+                            233,
+                            234,
+                            235,
+                            236,
+                            237,
+                            238,
+                            239,
+                            240,
+                            241,
+                            242,
+                            243,
+                            244,
+                            245,
+                            246,
+                            247,
+                            248,
+                            249,
+                            250,
+                            251,
+                            252,
+                            253,
+                            254,
+                            255,
+                        ],
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__escape_alias.snap

@@ -3,24 +3,18 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..12,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..12,
+            value: Constant(
+                ExprConstant {
                     range: 0..12,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Str(
-                                "\u{1b}",
-                            ),
-                            kind: None,
-                        },
+                    value: Str(
+                        "\u{1b}",
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__escape_char_in_byte_literal.snap

@@ -3,35 +3,29 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..13,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..13,
+            value: Constant(
+                ExprConstant {
                     range: 0..13,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Bytes(
-                                [
-                                    111,
-                                    109,
-                                    107,
-                                    109,
-                                    111,
-                                    107,
-                                    92,
-                                    88,
-                                    97,
-                                    97,
-                                ],
-                            ),
-                            kind: None,
-                        },
+                    value: Bytes(
+                        [
+                            111,
+                            109,
+                            107,
+                            109,
+                            111,
+                            107,
+                            92,
+                            88,
+                            97,
+                            97,
+                        ],
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__escape_octet.snap

@@ -3,30 +3,24 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..14,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..14,
+            value: Constant(
+                ExprConstant {
                     range: 0..14,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Bytes(
-                                [
-                                    35,
-                                    97,
-                                    4,
-                                    83,
-                                    52,
-                                ],
-                            ),
-                            kind: None,
-                        },
+                    value: Bytes(
+                        [
+                            35,
+                            97,
+                            4,
+                            83,
+                            52,
+                        ],
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__form_feed_alias.snap

@@ -3,24 +3,18 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..15,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..15,
+            value: Constant(
+                ExprConstant {
                     range: 0..15,
-                    custom: (),
-                    node: Constant(
-                        ExprConstant {
-                            value: Str(
-                                "\u{c}",
-                            ),
-                            kind: None,
-                        },
+                    value: Str(
+                        "\u{c}",
                     ),
+                    kind: None,
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_character.snap

@@ -3,58 +3,43 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..8,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..8,
+            value: JoinedStr(
+                ExprJoinedStr {
                     range: 0..8,
-                    custom: (),
-                    node: JoinedStr(
-                        ExprJoinedStr {
-                            values: [
-                                Attributed {
-                                    range: 0..8,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Str(
-                                                "\\",
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 0..8,
-                                    custom: (),
-                                    node: FormattedValue(
-                                        ExprFormattedValue {
-                                            value: Attributed {
-                                                range: 5..6,
-                                                custom: (),
-                                                node: Name(
-                                                    ExprName {
-                                                        id: Identifier(
-                                                            "x",
-                                                        ),
-                                                        ctx: Load,
-                                                    },
-                                                ),
-                                            },
-                                            conversion: Int(
-                                                0,
-                                            ),
-                                            format_spec: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                        },
-                    ),
+                    values: [
+                        Constant(
+                            ExprConstant {
+                                range: 0..8,
+                                value: Str(
+                                    "\\",
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        FormattedValue(
+                            ExprFormattedValue {
+                                range: 0..8,
+                                value: Name(
+                                    ExprName {
+                                        range: 5..6,
+                                        id: Identifier(
+                                            "x",
+                                        ),
+                                        ctx: Load,
+                                    },
+                                ),
+                                conversion: Int(
+                                    0,
+                                ),
+                                format_spec: None,
+                            },
+                        ),
+                    ],
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__fstring_escaped_newline.snap

@@ -3,58 +3,43 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..8,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..8,
+            value: JoinedStr(
+                ExprJoinedStr {
                     range: 0..8,
-                    custom: (),
-                    node: JoinedStr(
-                        ExprJoinedStr {
-                            values: [
-                                Attributed {
-                                    range: 0..8,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Str(
-                                                "\n",
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 0..8,
-                                    custom: (),
-                                    node: FormattedValue(
-                                        ExprFormattedValue {
-                                            value: Attributed {
-                                                range: 5..6,
-                                                custom: (),
-                                                node: Name(
-                                                    ExprName {
-                                                        id: Identifier(
-                                                            "x",
-                                                        ),
-                                                        ctx: Load,
-                                                    },
-                                                ),
-                                            },
-                                            conversion: Int(
-                                                0,
-                                            ),
-                                            format_spec: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                        },
-                    ),
+                    values: [
+                        Constant(
+                            ExprConstant {
+                                range: 0..8,
+                                value: Str(
+                                    "\n",
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        FormattedValue(
+                            ExprFormattedValue {
+                                range: 0..8,
+                                value: Name(
+                                    ExprName {
+                                        range: 5..6,
+                                        id: Identifier(
+                                            "x",
+                                        ),
+                                        ctx: Load,
+                                    },
+                                ),
+                                conversion: Int(
+                                    0,
+                                ),
+                                format_spec: None,
+                            },
+                        ),
+                    ],
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__fstring_line_continuation.snap

@@ -3,58 +3,43 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..9,
-        custom: (),
-        node: Expr(
-            StmtExpr {
-                value: Attributed {
+    Expr(
+        StmtExpr {
+            range: 0..9,
+            value: JoinedStr(
+                ExprJoinedStr {
                     range: 0..9,
-                    custom: (),
-                    node: JoinedStr(
-                        ExprJoinedStr {
-                            values: [
-                                Attributed {
-                                    range: 0..9,
-                                    custom: (),
-                                    node: Constant(
-                                        ExprConstant {
-                                            value: Str(
-                                                "\\\n",
-                                            ),
-                                            kind: None,
-                                        },
-                                    ),
-                                },
-                                Attributed {
-                                    range: 0..9,
-                                    custom: (),
-                                    node: FormattedValue(
-                                        ExprFormattedValue {
-                                            value: Attributed {
-                                                range: 6..7,
-                                                custom: (),
-                                                node: Name(
-                                                    ExprName {
-                                                        id: Identifier(
-                                                            "x",
-                                                        ),
-                                                        ctx: Load,
-                                                    },
-                                                ),
-                                            },
-                                            conversion: Int(
-                                                0,
-                                            ),
-                                            format_spec: None,
-                                        },
-                                    ),
-                                },
-                            ],
-                        },
-                    ),
+                    values: [
+                        Constant(
+                            ExprConstant {
+                                range: 0..9,
+                                value: Str(
+                                    "\\\n",
+                                ),
+                                kind: None,
+                            },
+                        ),
+                        FormattedValue(
+                            ExprFormattedValue {
+                                range: 0..9,
+                                value: Name(
+                                    ExprName {
+                                        range: 6..7,
+                                        id: Identifier(
+                                            "x",
+                                        ),
+                                        ctx: Load,
+                                    },
+                                ),
+                                conversion: Int(
+                                    0,
+                                ),
+                                format_spec: None,
+                            },
+                        ),
+                    ],
                 },
-            },
-        ),
-    },
+            ),
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base.snap

@@ -3,52 +3,40 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..10,
-        custom: (),
-        node: Constant(
-            ExprConstant {
-                value: Str(
-                    "user=",
-                ),
-                kind: None,
-            },
-        ),
-    },
-    Attributed {
-        range: 0..10,
-        custom: (),
-        node: Constant(
-            ExprConstant {
-                value: Str(
-                    "",
-                ),
-                kind: None,
-            },
-        ),
-    },
-    Attributed {
-        range: 0..10,
-        custom: (),
-        node: FormattedValue(
-            ExprFormattedValue {
-                value: Attributed {
+    Constant(
+        ExprConstant {
+            range: 0..10,
+            value: Str(
+                "user=",
+            ),
+            kind: None,
+        },
+    ),
+    Constant(
+        ExprConstant {
+            range: 0..10,
+            value: Str(
+                "",
+            ),
+            kind: None,
+        },
+    ),
+    FormattedValue(
+        ExprFormattedValue {
+            range: 0..10,
+            value: Name(
+                ExprName {
                     range: 3..7,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "user",
-                            ),
-                            ctx: Load,
-                        },
+                    id: Identifier(
+                        "user",
                     ),
+                    ctx: Load,
                 },
-                conversion: Int(
-                    114,
-                ),
-                format_spec: None,
-            },
-        ),
-    },
+            ),
+            conversion: Int(
+                114,
+            ),
+            format_spec: None,
+        },
+    ),
 ]

parser/src/snapshots/rustpython_parser__string__tests__fstring_parse_self_documenting_base_more.snap

@@ -3,124 +3,94 @@ source: parser/src/string.rs
 expression: parse_ast
 ---
 [
-    Attributed {
-        range: 0..38,
-        custom: (),
-        node: Constant(
-            ExprConstant {
-                value: Str(
-                    "mix ",
-                ),
-                kind: None,
-            },
-        ),
-    },
-    Attributed {
-        range: 0..38,
-        custom: (),
-        node: Constant(
-            ExprConstant {
-                value: Str(
-                    "user=",
-                ),
-                kind: None,
-            },
-        ),
-    },
-    Attributed {
-        range: 0..38,
-        custom: (),
-        node: Constant(
-            ExprConstant {
-                value: Str(
-                    "",
-                ),
-                kind: None,
-            },
-        ),
-    },
-    Attributed {
-        range: 0..38,
-        custom: (),
-        node: FormattedValue(
-            ExprFormattedValue {
-                value: Attributed {
+    Constant(
+        ExprConstant {
+            range: 0..38,
+            value: Str(
+                "mix ",
+            ),
+            kind: None,
+        },
+    ),
+    Constant(
+        ExprConstant {
+            range: 0..38,
+            value: Str(
+                "user=",
+            ),
+            kind: None,
+        },
+    ),
+    Constant(
+        ExprConstant {
+            range: 0..38,
+            value: Str(
+                "",
+            ),
+            kind: None,
+        },
+    ),
+    FormattedValue(
+        ExprFormattedValue {
+            range: 0..38,
+            value: Name(
+                ExprName {
                     range: 7..11,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "user",
-                            ),
-                            ctx: Load,
-                        },
+                    id: Identifier(
+                        "user",
                     ),
+                    ctx: Load,
                 },
-                conversion: Int(
-                    114,
-                ),
-                format_spec: None,
-            },
-        ),
-    },
-    Attributed {
-        range: 0..38,
-        custom: (),
-        node: Constant(
-            ExprConstant {
-                value: Str(
-                    " with text and ",
-                ),
-                kind: None,
-            },
-        ),
-    },
-    Attributed {
-        range: 0..38,
-        custom: (),
-        node: Constant(
-            ExprConstant {
-                value: Str(
-                    "second=",
-                ),
-                kind: None,
-            },
-        ),
-    },
-    Attributed {
-        range: 0..38,
-        custom: (),
-        node: Constant(
-            ExprConstant {
-                value: Str(
-                    "",
-                ),
-                kind: None,
-            },
-        ),
-    },
-    Attributed {
-        range: 0..38,
-        custom: (),
-        node: FormattedValue(
-            ExprFormattedValue {
-                value: Attributed {
+            ),
+            conversion: Int(
+                114,
+            ),
+            format_spec: None,
+        },
+    ),
+    Constant(
+        ExprConstant {
+            range: 0..38,
+            value: Str(
+                " with text and ",
+            ),
+            kind: None,
+        },
+    ),
+    Constant(
+        ExprConstant {
+            range: 0..38,
+            value: Str(
+                "second=",
+            ),
+            kind: None,
+        },
+    ),
+    Constant(
+        ExprConstant {
+            range: 0..38,
+            value: Str(
+                "",
+            ),
+            kind: None,
+        },
+    ),
+    FormattedValue(
+        ExprFormattedValue {
+            range: 0..38,
+            value: Name(
+                ExprName {
                     range: 29..35,
-                    custom: (),
-                    node: Name(
-                        ExprName {
-                            id: Identifier(
-                                "second",
-                            ),
-                            ctx: Load,
-                        },
+                    id: Identifier(
+                        "second",
                     ),
+                    ctx: Load,
                 },
-                conversion: Int(
-                    114,
-                ),
-                format_spec: None,
-            },
-        ),
-    },
+            ),
+            conversion: Int(
+                114,
+            ),
+            format_spec: None,
+        },
+    ),
 ]