Merge branch 'main' into redsun82/cargo-upgrade-3

rust/schema/annotations.py

@@ -16,6 +16,14 @@ class LoopingExpr(LabelableExpr):
     loop_body: optional["BlockExpr"] | child
 
 
+@annotate(Adt, replace_bases={AstNode: Item})
+class _:
+    """
+    An ADT (Abstract Data Type) definition, such as `Struct`, `Enum`, or `Union`.
+    """
+    derive_macro_expansions: list[MacroItems] | child | rust.detach
+
+
 @annotate(Module)
 @rust.doc_test_signature(None)
 class _:
@@ -1032,7 +1040,7 @@ class _:
     """
 
 
-@annotate(Enum)
+@annotate(Enum, replace_bases={Item: None})  # still an Item via Adt
 class _:
     """
     An enum declaration.
@@ -1827,7 +1835,7 @@ class _:
     """
 
 
-@annotate(Struct)
+@annotate(Struct, replace_bases={Item: None})  # still an Item via Adt
 class _:
     """
     A Struct. For example:
@@ -2006,7 +2014,7 @@ class _:
     """
 
 
-@annotate(Union)
+@annotate(Union, replace_bases={Item: None})  # still an Item via Adt
 class _:
     """
     A union declaration.
@@ -2054,7 +2062,7 @@ class _:
     """
 
 
-@annotate(Variant, add_bases=(Addressable,))
+@annotate(Variant, replace_bases={AstNode: Addressable})
 class _:
     """
     A variant in an enum declaration.

rust/schema/ast.py

@@ -2,6 +2,9 @@
 
 from .prelude import *
 
+class Adt(AstNode, ):
+    pass
+
 class AsmOperand(AstNode, ):
     pass
 
@@ -38,9 +41,6 @@ class TypeRepr(AstNode, ):
 class UseBoundGenericArg(AstNode, ):
     pass
 
-class VariantDef(AstNode, ):
-    pass
-
 class Item(Stmt, ):
     pass
 
@@ -209,7 +209,7 @@ class ContinueExpr(Expr, ):
 class DynTraitTypeRepr(TypeRepr, ):
     type_bound_list: optional["TypeBoundList"] | child
 
-class Enum(Item, ):
+class Enum(Adt, Item, ):
     attrs: list["Attr"] | child
     generic_param_list: optional["GenericParamList"] | child
     name: optional["Name"] | child
@@ -627,7 +627,7 @@ class StmtList(AstNode, ):
     statements: list["Stmt"] | child
     tail_expr: optional["Expr"] | child
 
-class Struct(Item, VariantDef, ):
+class Struct(Adt, Item, ):
     attrs: list["Attr"] | child
     field_list: optional["FieldList"] | child
     generic_param_list: optional["GenericParamList"] | child
@@ -715,7 +715,7 @@ class TypeParam(GenericParam, ):
 class UnderscoreExpr(Expr, ):
     attrs: list["Attr"] | child
 
-class Union(Item, VariantDef, ):
+class Union(Adt, Item, ):
     attrs: list["Attr"] | child
     generic_param_list: optional["GenericParamList"] | child
     name: optional["Name"] | child
@@ -740,7 +740,7 @@ class UseTree(AstNode, ):
 class UseTreeList(AstNode, ):
     use_trees: list["UseTree"] | child
 
-class Variant(VariantDef, ):
+class Variant(AstNode, ):
     attrs: list["Attr"] | child
     discriminant: optional["Expr"] | child
     field_list: optional["FieldList"] | child