From 22bc924c265de8f0081d91f771abd958ec825ae5 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Wed, 17 Dec 2025 11:03:16 +0100
Subject: [PATCH 1/8] Rust: Apply Black formatter to annotations.py

---
 rust/schema/annotations.py | 125 +++++++++++++++++++++++++++++++------
 1 file changed, 105 insertions(+), 20 deletions(-)

diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index 96173957278f..bad273419d94 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -6,6 +6,7 @@ class LabelableExpr(Expr):
     """
     The base class for expressions that can be labeled (`LoopExpr`, `ForExpr`, `WhileExpr` or `BlockExpr`).
     """
+
     label: optional[Label] | child
 
 
@@ -13,6 +14,7 @@ class LoopingExpr(LabelableExpr):
     """
     The base class for expressions that loop (`LoopExpr`, `ForExpr` or `WhileExpr`).
     """
+
     loop_body: optional["BlockExpr"] | child
 
 
@@ -21,6 +23,7 @@ class _:
     """
     An ADT (Abstract Data Type) definition, such as `Struct`, `Enum`, or `Union`.
     """
+
     derive_macro_expansions: list[MacroItems] | child | rust.detach
 
 
@@ -95,8 +98,8 @@ class _:
     foo::bar;
     ```
     """
-    segment: _ | ql.db_table_name("path_segments_") | doc(
-        "last segment of this path")
+
+    segment: _ | ql.db_table_name("path_segments_") | doc("last segment of this path")
 
 
 @annotate(GenericArgList)
@@ -132,7 +135,9 @@ class PathExprBase(Expr):
     """
 
 
-@annotate(PathExpr, replace_bases={Expr: PathExprBase}, add_bases=(PathAstNode,), cfg=True)
+@annotate(
+    PathExpr, replace_bases={Expr: PathExprBase}, add_bases=(PathAstNode,), cfg=True
+)
 @qltest.test_with(Path)
 class _:
     """
@@ -144,6 +149,7 @@ class _:
     let z = <TypeRepr as Trait>::foo;
     ```
     """
+
     path: drop
 
 
@@ -195,6 +201,7 @@ class _:
     }
     ```
     """
+
     label: drop
 
 
@@ -224,6 +231,7 @@ class _:
     };
     ```
     """
+
     label: drop
     loop_body: drop
 
@@ -297,8 +305,10 @@ class _:
     }
     ```
     """
+
     scrutinee: _ | doc(
-        "scrutinee (the expression being matched) of this match expression")
+        "scrutinee (the expression being matched) of this match expression"
+    )
 
 
 @annotate(ContinueExpr, cfg=True)
@@ -348,7 +358,7 @@ class _:
         0;
     };
     ```
-  """
+    """
 
 
 @annotate(ReturnExpr, cfg=True)
@@ -432,6 +442,7 @@ class _:
     Foo { a: m, .. } = second;
     ```
     """
+
     path: drop
 
 
@@ -579,6 +590,7 @@ class ArrayExpr(Expr):
     [1; 10];
     ```
     """
+
     exprs: list[Expr] | child
     attrs: list[Attr] | child
 
@@ -591,6 +603,7 @@ class ArrayListExpr(ArrayExpr):
     [1, 2, 3];
     ```
     """
+
     __cfg__ = True
 
 
@@ -602,6 +615,7 @@ class ArrayRepeatExpr(ArrayExpr):
     [1; 10];
     ```
     """
+
     __cfg__ = True
 
     repeat_operand: Expr | child
@@ -741,6 +755,7 @@ class _:
     }
     ```
     """
+
     path: drop
 
 
@@ -784,6 +799,7 @@ class _:
     }
     ```
     """
+
     path: drop
 
 
@@ -831,6 +847,7 @@ class _:
     };
     ```
     """
+
     path: drop
 
 
@@ -993,10 +1010,18 @@ class _:
     const X: i32 = 42;
     ```
     """
-    has_implementation: predicate | doc("this constant has an implementation") | desc("""
+
+    has_implementation: (
+        predicate
+        | doc("this constant has an implementation")
+        | desc(
+            """
       This is the same as `hasBody` for source code, but for library code (for which we always skip
       the body), this will hold when the body was present in the original code.
-    """) | rust.detach
+    """
+        )
+        | rust.detach
+    )
 
 
 @annotate(ConstArg)
@@ -1146,6 +1171,7 @@ class _:
     }
     ```
     """
+
     label: drop
     loop_body: drop
 
@@ -1162,6 +1188,7 @@ class _:
     ```
     """
 
+
 @annotate(FormatArgsArg, cfg=True)
 @qltest.test_with(FormatArgsExpr)
 class _:
@@ -1185,6 +1212,7 @@ class _:
     format_args!("{x}, {y}");
     ```
     """
+
     formats: list["Format"] | child | synth
 
 
@@ -1279,6 +1307,7 @@ class _:
     enum E {}
     ```
     """
+
     attribute_macro_expansion: optional[MacroItems] | child | rust.detach
 
 
@@ -1361,6 +1390,7 @@ class _:
     println!("Hello, world!");
     ```
     """
+
     macro_call_expansion: optional[AstNode] | child | rust.detach
 
 
@@ -1414,6 +1444,7 @@ class MacroBlockExpr(Expr):
     my_macro!();  // this macro expands to a sequence of statements (and an expression)
     ```
     """
+
     __cfg__ = True
 
     statements: list[Stmt] | child
@@ -1530,6 +1561,7 @@ class ParamBase(AstNode):
     """
     A normal parameter, `Param`, or a self parameter `SelfParam`.
     """
+
     attrs: list["Attr"] | child
     type_repr: optional["TypeRepr"] | child
 
@@ -1549,6 +1581,7 @@ class _:
     }
     ```
     """
+
     attrs: drop
     type_repr: drop
 
@@ -1603,6 +1636,7 @@ class _:
     - `widgets(..)`
     - `<T as Iterator>`
     """
+
     type_repr: optional["TypeRepr"] | child | rust.detach
     trait_type_repr: optional["PathTypeRepr"] | child | rust.detach
 
@@ -1777,6 +1811,7 @@ class _:
     }
     ```
     """
+
     attrs: drop
     type_repr: drop
 
@@ -1835,14 +1870,28 @@ class _:
     //  ^^^^^^^^^
     ```
     """
-    statements: _ | doc("statements of this statement list") | desc("""
+
+    statements: (
+        _
+        | doc("statements of this statement list")
+        | desc(
+            """
       The statements of a `StmtList` do not include any tail expression, which
       can be accessed with predicates such as `getTailExpr`.
-    """)
-    tail_expr: _ | doc("tail expression of this statement list") | desc("""
+    """
+        )
+    )
+    tail_expr: (
+        _
+        | doc("tail expression of this statement list")
+        | desc(
+            """
       The tail expression is the expression at the end of a block, that
       determines the block's value.
-    """)
+    """
+        )
+    )
+
 
 @annotate(Struct, replace_bases={Item: None})  # still an Item via Adt
 class _:
@@ -1855,6 +1904,7 @@ class _:
     }
     ```
     """
+
     field_list: _ | ql.db_table_name("struct_field_lists_")
 
 
@@ -2152,6 +2202,7 @@ class _:
     }
     ```
     """
+
     label: drop
     loop_body: drop
 
@@ -2160,10 +2211,17 @@ class _:
 class _:
     param_list: drop
     attrs: drop
-    has_implementation: predicate | doc("this function has an implementation") | desc("""
+    has_implementation: (
+        predicate
+        | doc("this function has an implementation")
+        | desc(
+            """
       This is the same as `hasBody` for source code, but for library code (for which we always skip
       the body), this will hold when the body was present in the original code.
-    """) | rust.detach
+    """
+        )
+        | rust.detach
+    )
 
 
 @annotate(ClosureExpr, add_bases=[Callable])
@@ -2191,35 +2249,61 @@ class Format(Locatable):
     println!("Value {value:#width$.precision$}");
     ```
     """
+
     parent: FormatArgsExpr
     index: int
-    argument_ref: optional["FormatArgument"] | child | desc("""
+    argument_ref: (
+        optional["FormatArgument"]
+        | child
+        | desc(
+            """
         For example `name` and `0` in:
         ```rust
         let name = "Alice";
         println!("{name} in wonderland");
         println!("{0} in wonderland", name);
         ```
-    """)
-    width_argument: optional["FormatArgument"] | child | desc("""
+    """
+        )
+    )
+    width_argument: (
+        optional["FormatArgument"]
+        | child
+        | desc(
+            """
         For example `width` and `1` in:
         ```rust
         let width = 6;
         println!("{:width$}", PI);
         println!("{:1$}", PI, width);
         ```
-    """)
-    precision_argument: optional["FormatArgument"] | child | desc("""
+    """
+        )
+    )
+    precision_argument: (
+        optional["FormatArgument"]
+        | child
+        | desc(
+            """
         For example `prec` and `1` in:
         ```rust
         let prec = 6;
         println!("{:.prec$}", PI);
         println!("{:.1$}", PI, prec);
         ```
-    """)
+    """
+        )
+    )
 
 
-@synth.on_arguments(parent=FormatArgsExpr, index=int, kind=int, name=string, positional=boolean, offset=int)
+@synth.on_arguments(
+    parent=FormatArgsExpr,
+    index=int,
+    kind=int,
+    name=string,
+    positional=boolean,
+    offset=int,
+)
 @qltest.test_with(FormatArgsExpr)
 class FormatArgument(Locatable):
     """
@@ -2232,6 +2316,7 @@ class FormatArgument(Locatable):
     println!("Value {0:#1$.2$}", value, width, precision);
     ```
     """
+
     parent: Format
     variable: optional[FormatTemplateVariableAccess] | child
 

From ca6c05425696caa5c9ee0cabdf3e3bc2686d09ae Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Wed, 17 Dec 2025 11:06:26 +0100
Subject: [PATCH 2/8] Rust: Rename `Adt` class and lift common predicates to it

---
 rust/ast-generator/src/main.rs       |  1 +
 rust/extractor/src/translate/base.rs |  4 ++--
 rust/schema/annotations.py           | 32 +++++++++++++++++++++++-----
 rust/schema/ast.py                   |  8 +++----
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index 4b68c1d42a62..ddacc0d913ec 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -15,6 +15,7 @@ use ungrammar::Grammar;
 
 fn class_name(type_name: &str) -> String {
     match type_name {
+        "Adt" => "TypeItem".to_owned(),
         "BinExpr" => "BinaryExpr".to_owned(),
         "ElseBranch" => "Expr".to_owned(),
         "Fn" => "Function".to_owned(),
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index ee26da665b27..a3a0b3c9133b 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -674,7 +674,7 @@ impl<'a> Translator<'a> {
     pub(crate) fn emit_derive_expansion(
         &mut self,
         node: &(impl Into<ast::Adt> + Clone),
-        label: impl Into<Label<generated::Adt>> + Copy,
+        label: impl Into<Label<generated::TypeItem>> + Copy,
     ) {
         let Some(semantics) = self.semantics else {
             return;
@@ -686,7 +686,7 @@ impl<'a> Translator<'a> {
             .flatten()
             .filter_map(|expanded| self.process_item_macro_expansion(&node, expanded))
             .collect::<Vec<_>>();
-        generated::Adt::emit_derive_macro_expansions(
+        generated::TypeItem::emit_derive_macro_expansions(
             label.into(),
             expansions,
             &mut self.trap.writer,
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index bad273419d94..8896e5809f27 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -18,13 +18,18 @@ class LoopingExpr(LabelableExpr):
     loop_body: optional["BlockExpr"] | child
 
 
-@annotate(Adt, replace_bases={AstNode: Item})
+@annotate(TypeItem, replace_bases={AstNode: Item})
 class _:
     """
-    An ADT (Abstract Data Type) definition, such as `Struct`, `Enum`, or `Union`.
+    An item that defines a type. Either a `Struct`, `Enum`, or `Union`.
     """
 
     derive_macro_expansions: list[MacroItems] | child | rust.detach
+    attrs: list["Attr"] | child
+    generic_param_list: optional["GenericParamList"] | child
+    name: optional["Name"] | child
+    visibility: optional["Visibility"] | child
+    where_clause: optional["WhereClause"] | child
 
 
 @annotate(Module)
@@ -1063,7 +1068,7 @@ class _:
     """
 
 
-@annotate(Enum, replace_bases={Item: None})  # still an Item via Adt
+@annotate(Enum, replace_bases={Item: None})
 class _:
     """
     An enum declaration.
@@ -1074,6 +1079,12 @@ class _:
     ```
     """
 
+    attrs: drop
+    generic_param_list: drop
+    name: drop
+    visibility: drop
+    where_clause: drop
+
 
 @annotate(ExternBlock)
 class _:
@@ -1893,7 +1904,7 @@ class _:
     )
 
 
-@annotate(Struct, replace_bases={Item: None})  # still an Item via Adt
+@annotate(Struct, replace_bases={Item: None})
 class _:
     """
     A Struct. For example:
@@ -1906,6 +1917,11 @@ class _:
     """
 
     field_list: _ | ql.db_table_name("struct_field_lists_")
+    attrs: drop
+    generic_param_list: drop
+    name: drop
+    visibility: drop
+    where_clause: drop
 
 
 @annotate(TokenTree)
@@ -2075,7 +2091,7 @@ class _:
     """
 
 
-@annotate(Union, replace_bases={Item: None})  # still an Item via Adt
+@annotate(Union, replace_bases={Item: None})
 class _:
     """
     A union declaration.
@@ -2086,6 +2102,12 @@ class _:
     ```
     """
 
+    attrs: drop
+    generic_param_list: drop
+    name: drop
+    visibility: drop
+    where_clause: drop
+
 
 @annotate(Use)
 class _:
diff --git a/rust/schema/ast.py b/rust/schema/ast.py
index d338c7a16361..5d8a7393ea6f 100644
--- a/rust/schema/ast.py
+++ b/rust/schema/ast.py
@@ -2,7 +2,7 @@
 
 from .prelude import *
 
-class Adt(AstNode, ):
+class TypeItem(AstNode, ):
     pass
 
 class AsmOperand(AstNode, ):
@@ -206,7 +206,7 @@ class ContinueExpr(Expr, ):
 class DynTraitTypeRepr(TypeRepr, ):
     type_bound_list: optional["TypeBoundList"] | child
 
-class Enum(Adt, Item, ):
+class Enum(TypeItem, Item, ):
     attrs: list["Attr"] | child
     generic_param_list: optional["GenericParamList"] | child
     name: optional["Name"] | child
@@ -623,7 +623,7 @@ class StmtList(AstNode, ):
     statements: list["Stmt"] | child
     tail_expr: optional["Expr"] | child
 
-class Struct(Adt, Item, ):
+class Struct(TypeItem, Item, ):
     attrs: list["Attr"] | child
     field_list: optional["FieldList"] | child
     generic_param_list: optional["GenericParamList"] | child
@@ -712,7 +712,7 @@ class TypeParam(GenericParam, ):
 class UnderscoreExpr(Expr, ):
     attrs: list["Attr"] | child
 
-class Union(Adt, Item, ):
+class Union(TypeItem, Item, ):
     attrs: list["Attr"] | child
     generic_param_list: optional["GenericParamList"] | child
     name: optional["Name"] | child

From dd02ac39644b766e5ec8bb2e96f39dc39fc61b5f Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Wed, 17 Dec 2025 11:11:44 +0100
Subject: [PATCH 3/8] Rust: Update generated files

---
 rust/extractor/src/generated/.generated.list  |   2 +-
 rust/extractor/src/generated/top.rs           | 218 +++++++++---------
 rust/ql/.generated.list                       |  32 +--
 rust/ql/.gitattributes                        |   6 +-
 rust/ql/lib/codeql/rust/elements.qll          |   2 +-
 rust/ql/lib/codeql/rust/elements/Adt.qll      |  13 --
 rust/ql/lib/codeql/rust/elements/Enum.qll     |   7 +-
 rust/ql/lib/codeql/rust/elements/Struct.qll   |   7 +-
 rust/ql/lib/codeql/rust/elements/TypeItem.qll |  18 ++
 rust/ql/lib/codeql/rust/elements/Union.qll    |   7 +-
 .../{AdtImpl.qll => TypeItemImpl.qll}         |  10 +-
 .../rust/elements/internal/generated/Adt.qll  |  45 ----
 .../rust/elements/internal/generated/Enum.qll |  79 +------
 .../internal/generated/ParentChild.qll        |  48 ++--
 .../rust/elements/internal/generated/Raw.qll  | 204 ++++++----------
 .../elements/internal/generated/Struct.qll    |  84 +------
 .../elements/internal/generated/Synth.qll     |  70 +++---
 .../elements/internal/generated/TypeItem.qll  | 126 ++++++++++
 .../elements/internal/generated/Union.qll     |  81 +------
 rust/ql/lib/rust.dbscheme                     | 154 ++++---------
 .../extractor-tests/generated/Enum/Enum.ql    |   8 +-
 .../generated/Struct/Struct.ql                |   8 +-
 .../extractor-tests/generated/Union/Union.ql  |   8 +-
 23 files changed, 476 insertions(+), 761 deletions(-)
 delete mode 100644 rust/ql/lib/codeql/rust/elements/Adt.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/TypeItem.qll
 rename rust/ql/lib/codeql/rust/elements/internal/{AdtImpl.qll => TypeItemImpl.qll} (56%)
 delete mode 100644 rust/ql/lib/codeql/rust/elements/internal/generated/Adt.qll
 create mode 100644 rust/ql/lib/codeql/rust/elements/internal/generated/TypeItem.qll

diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 578b21fc992b..11f99621d162 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs b829c8ab9ec5ff07b997b9ee0b2c333d63e24eddcf7c5fc2b95a9a7f17a84a69 b829c8ab9ec5ff07b997b9ee0b2c333d63e24eddcf7c5fc2b95a9a7f17a84a69
+top.rs 92ef55101899570ddcb197b872a5b6a38aed874bb8f0ad604af27b2fec00eba5 92ef55101899570ddcb197b872a5b6a38aed874bb8f0ad604af27b2fec00eba5
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 510f6579d407..2365084bb828 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -9006,82 +9006,6 @@ impl From<trap::Label<YieldExpr>> for trap::Label<Element> {
     }
 }
 
-#[derive(Debug)]
-pub struct Adt {
-    _unused: ()
-}
-
-impl Adt {
-    pub fn emit_derive_macro_expansion(id: trap::Label<Self>, i: usize, value: trap::Label<MacroItems>, out: &mut trap::Writer) {
-        out.add_tuple("adt_derive_macro_expansions", vec![id.into(), i.into(), value.into()]);
-    }
-
-    pub fn emit_derive_macro_expansions(id: trap::Label<Self>, values: impl IntoIterator<Item=trap::Label<MacroItems>>, out: &mut trap::Writer) {
-        values
-            .into_iter()
-            .enumerate()
-            .for_each(|(i, value)| Self::emit_derive_macro_expansion(id, i, value, out));
-    }
-}
-
-impl trap::TrapClass for Adt {
-    fn class_name() -> &'static str { "Adt" }
-}
-
-impl From<trap::Label<Adt>> for trap::Label<Item> {
-    fn from(value: trap::Label<Adt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Adt is a subclass of Item
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Adt>> for trap::Label<Stmt> {
-    fn from(value: trap::Label<Adt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Adt is a subclass of Stmt
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Adt>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Adt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Adt is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Adt>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Adt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Adt is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Adt>> for trap::Label<Element> {
-    fn from(value: trap::Label<Adt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Adt is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Adt>> for trap::Label<Addressable> {
-    fn from(value: trap::Label<Adt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Adt is a subclass of Addressable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct AsmExpr {
     pub id: trap::TrapId<AsmExpr>,
@@ -10305,6 +10229,82 @@ impl From<trap::Label<TraitAlias>> for trap::Label<Addressable> {
     }
 }
 
+#[derive(Debug)]
+pub struct TypeItem {
+    _unused: ()
+}
+
+impl TypeItem {
+    pub fn emit_derive_macro_expansion(id: trap::Label<Self>, i: usize, value: trap::Label<MacroItems>, out: &mut trap::Writer) {
+        out.add_tuple("type_item_derive_macro_expansions", vec![id.into(), i.into(), value.into()]);
+    }
+
+    pub fn emit_derive_macro_expansions(id: trap::Label<Self>, values: impl IntoIterator<Item=trap::Label<MacroItems>>, out: &mut trap::Writer) {
+        values
+            .into_iter()
+            .enumerate()
+            .for_each(|(i, value)| Self::emit_derive_macro_expansion(id, i, value, out));
+    }
+}
+
+impl trap::TrapClass for TypeItem {
+    fn class_name() -> &'static str { "TypeItem" }
+}
+
+impl From<trap::Label<TypeItem>> for trap::Label<Item> {
+    fn from(value: trap::Label<TypeItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeItem is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeItem>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<TypeItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeItem is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeItem>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeItem is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeItem>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeItem is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeItem>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeItem is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeItem>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<TypeItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeItem is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct Use {
     pub id: trap::TrapId<Use>,
@@ -10521,9 +10521,9 @@ pub struct Enum {
     pub attrs: Vec<trap::Label<Attr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub name: Option<trap::Label<Name>>,
-    pub variant_list: Option<trap::Label<VariantList>>,
     pub visibility: Option<trap::Label<Visibility>>,
     pub where_clause: Option<trap::Label<WhereClause>>,
+    pub variant_list: Option<trap::Label<VariantList>>,
 }
 
 impl trap::TrapEntry for Enum {
@@ -10534,22 +10534,22 @@ impl trap::TrapEntry for Enum {
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("enums", vec![id.into()]);
         for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("enum_attrs", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("type_item_attrs", vec![id.into(), i.into(), v.into()]);
         }
         if let Some(v) = self.generic_param_list {
-            out.add_tuple("enum_generic_param_lists", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_generic_param_lists", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.name {
-            out.add_tuple("enum_names", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.variant_list {
-            out.add_tuple("enum_variant_lists", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_names", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
-            out.add_tuple("enum_visibilities", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_visibilities", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.where_clause {
-            out.add_tuple("enum_where_clauses", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_where_clauses", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.variant_list {
+            out.add_tuple("enum_variant_lists", vec![id.into(), v.into()]);
         }
     }
 }
@@ -10558,9 +10558,9 @@ impl trap::TrapClass for Enum {
     fn class_name() -> &'static str { "Enum" }
 }
 
-impl From<trap::Label<Enum>> for trap::Label<Adt> {
+impl From<trap::Label<Enum>> for trap::Label<TypeItem> {
     fn from(value: trap::Label<Enum>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Adt
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of TypeItem
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11190,11 +11190,11 @@ impl From<trap::Label<Static>> for trap::Label<Addressable> {
 pub struct Struct {
     pub id: trap::TrapId<Struct>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub field_list: Option<trap::Label<FieldList>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub name: Option<trap::Label<Name>>,
     pub visibility: Option<trap::Label<Visibility>>,
     pub where_clause: Option<trap::Label<WhereClause>>,
+    pub field_list: Option<trap::Label<FieldList>>,
 }
 
 impl trap::TrapEntry for Struct {
@@ -11205,22 +11205,22 @@ impl trap::TrapEntry for Struct {
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("structs", vec![id.into()]);
         for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("struct_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.field_list {
-            out.add_tuple("struct_field_lists_", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_attrs", vec![id.into(), i.into(), v.into()]);
         }
         if let Some(v) = self.generic_param_list {
-            out.add_tuple("struct_generic_param_lists", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_generic_param_lists", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.name {
-            out.add_tuple("struct_names", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_names", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
-            out.add_tuple("struct_visibilities", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_visibilities", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.where_clause {
-            out.add_tuple("struct_where_clauses", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_where_clauses", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.field_list {
+            out.add_tuple("struct_field_lists_", vec![id.into(), v.into()]);
         }
     }
 }
@@ -11229,9 +11229,9 @@ impl trap::TrapClass for Struct {
     fn class_name() -> &'static str { "Struct" }
 }
 
-impl From<trap::Label<Struct>> for trap::Label<Adt> {
+impl From<trap::Label<Struct>> for trap::Label<TypeItem> {
     fn from(value: trap::Label<Struct>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Adt
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of TypeItem
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -11421,9 +11421,9 @@ pub struct Union {
     pub attrs: Vec<trap::Label<Attr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub name: Option<trap::Label<Name>>,
-    pub struct_field_list: Option<trap::Label<StructFieldList>>,
     pub visibility: Option<trap::Label<Visibility>>,
     pub where_clause: Option<trap::Label<WhereClause>>,
+    pub struct_field_list: Option<trap::Label<StructFieldList>>,
 }
 
 impl trap::TrapEntry for Union {
@@ -11434,22 +11434,22 @@ impl trap::TrapEntry for Union {
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("unions", vec![id.into()]);
         for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("union_attrs", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("type_item_attrs", vec![id.into(), i.into(), v.into()]);
         }
         if let Some(v) = self.generic_param_list {
-            out.add_tuple("union_generic_param_lists", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_generic_param_lists", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.name {
-            out.add_tuple("union_names", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.struct_field_list {
-            out.add_tuple("union_struct_field_lists", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_names", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
-            out.add_tuple("union_visibilities", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_visibilities", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.where_clause {
-            out.add_tuple("union_where_clauses", vec![id.into(), v.into()]);
+            out.add_tuple("type_item_where_clauses", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.struct_field_list {
+            out.add_tuple("union_struct_field_lists", vec![id.into(), v.into()]);
         }
     }
 }
@@ -11458,9 +11458,9 @@ impl trap::TrapClass for Union {
     fn class_name() -> &'static str { "Union" }
 }
 
-impl From<trap::Label<Union>> for trap::Label<Adt> {
+impl From<trap::Label<Union>> for trap::Label<TypeItem> {
     fn from(value: trap::Label<Union>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Union is a subclass of Adt
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of TypeItem
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index 7def99275cf8..de0cdb6224fb 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,7 +1,6 @@
 lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 1eac5a95247dec5cf51a453788b5bdebcf612590014b1e28f6b6f7e841c96a20 d4d8c9664ca406c3fd14d96a488eea97c42401e2791f41d7248ee5d3f299805c
 lib/codeql/rust/elements/Abi.qll 485a2e79f6f7bfd1c02a6e795a71e62dede3c3e150149d5f8f18b761253b7208 6159ba175e7ead0dd2e3f2788f49516c306ee11b1a443bd4bdc00b7017d559bd
 lib/codeql/rust/elements/Addressable.qll 13011bfd2e1556694c3d440cc34af8527da4df49ad92b62f2939d3699ff2cea5 ddb25935f7553a1a384b1abe2e4b4fa90ab50b952dadec32fd867afcb054f4be
-lib/codeql/rust/elements/Adt.qll c2afed4ac2e17039ccd98f74ea22111f4d765c4e232c50ccd3128da0d26da837 1380bde2eb667c6ec2ef5f8710aa24e926851c9e321ebc72ba514fa92c369dc3
 lib/codeql/rust/elements/ArgList.qll 3d2f6f5542340b80a4c6e944ac17aba0d00727588bb66e501453ac0f80c82f83 afd52700bf5a337f19827846667cd0fb1fea5abbbcbc353828e292a727ea58c9
 lib/codeql/rust/elements/ArrayExpr.qll e4e7cff3518c50ec908271906dd46c1fbe9098faa1e8cd06a27f0a6e8d165ed1 fe02a4f4197f57ecd1e8e82d6c9384148ec29d8b106d7f696795b2f325e4a71b
 lib/codeql/rust/elements/ArrayListExpr.qll 451aedcecb479c385ff497588c7a07fda304fd5b873270223a4f2c804e96b245 a8cb008f6f732215623b5626c84b37b651ca01ccafb2cf4c835df35d5140c6ad
@@ -45,7 +44,7 @@ lib/codeql/rust/elements/ContinueExpr.qll 9f27c5d5c819ad0ebc5bd10967ba8d33a9dc95
 lib/codeql/rust/elements/Crate.qll 1426960e6f36195e42ea5ea321405c1a72fccd40cd6c0a33673c321c20302d8d 1571a89f89dab43c5291b71386de7aadf52730755ba10f9d696db9ad2f760aff
 lib/codeql/rust/elements/DynTraitTypeRepr.qll e4d27112d27ae93c621defd2c976fd4e90663ab7f6115e83ae4fe8106cb5e015 eb9fde89698588f3b7116f62388c54e937f99559b22c93d11a5596e754560072
 lib/codeql/rust/elements/Element.qll 0b62d139fef54ed2cf2e2334806aa9bfbc036c9c2085d558f15a42cc3fa84c48 24b999b93df79383ef27ede46e38da752868c88a07fe35fcff5d526684ba7294
-lib/codeql/rust/elements/Enum.qll 55d5a4a775f07d9c1d5183af76f9d8de1d700bfe1dea427cc7ff3083f39e13de f00a585596f1d0ab34e6f2b7cdaba6d4a89005820478f810e8685478cf88100e
+lib/codeql/rust/elements/Enum.qll 13c1a3bddfff6c9cc644902652883aefc7721bc94bd8084a1a49acc156996d12 17a898434329437479de4fef27ce11f5996b1953168066bd6d51f93594cc79d1
 lib/codeql/rust/elements/Expr.qll e5d65e805ccf440d64d331e55df4c4144ab8c8f63f367382494714087659ffe8 2bbc1e5d3a65f413ec33d9822fa451fbdbe32349158db58cc0bfcfafb0e21bda
 lib/codeql/rust/elements/ExprStmt.qll 00ac4c7d0192b9e8b0f28d5ae59c27729ff5a831ca11938ea3e677a262337a64 7cc02aa5346cd7c50d75ca63cd6501097b0a3979eb2ed838adff114fe17d35a3
 lib/codeql/rust/elements/ExternBlock.qll 96c70d0761ec385fe17aa7228e15fd1711949d5abba5877a1c2f4c180d202125 38ad458868a368d437b2dda44307d788a85c887f45ea76c99adbfc9a53f14d81
@@ -144,7 +143,7 @@ lib/codeql/rust/elements/SourceFile.qll 0b6a3e58767c07602b19975009a2ad53ecf1fd72
 lib/codeql/rust/elements/Static.qll 9dca6d4fb80fb4ead49a3de89bec2b02bae6f96fbc2601dde35a2aa69a9bfdb0 70f67bc75d7799dab04ea7a7fd13286bb76bbe514be16d23149c59dfb31fd0c9
 lib/codeql/rust/elements/Stmt.qll 532b12973037301246daf7d8c0177f734202f43d9261c7a4ca6f5080eea8ca64 b838643c4f2b4623d2c816cddad0e68ca3e11f2879ab7beaece46f489ec4b1f3
 lib/codeql/rust/elements/StmtList.qll 8bad277dfd88735195b8fd43bb1395cb2393c488d89304d6a6e6d8ec3eb24b73 cd1d483aecb8bb1876b8153a872f680febc2ef6c315d661c85ec1b2fa07e4fc0
-lib/codeql/rust/elements/Struct.qll 297d3ea732fc7fbb8b8fb5479c1873ce84705146853ff752c84a6f70af12b923 3df0e5fd50a910a0b5611c3a860a1d7c318f6925c3a0727006d91840caf04812
+lib/codeql/rust/elements/Struct.qll e60a859c0112b7a7ce4a4752e936e0d58f413ceb895db25d77ece2fcc9d8881c 8bf69f80bb9ef54644d9540b8be7d331f73ba362817508489ff91619718bee6b
 lib/codeql/rust/elements/StructExpr.qll 84f384ef74c723796e514186037a91dd9666556f62c717f133ce22e9dda4425f 176497835252cfdfe110e58ebde9fbde553d03e44e07d3e4d8041e835dbf31b9
 lib/codeql/rust/elements/StructExprField.qll 3eb9f17ecd1ad38679689eb4ecc169d3a0b5b7a3fc597ae5a957a7aea2f74e4f 8fcd26f266f203004899a60447ba16e7eae4e3a654fbec7f54e26857730ede93
 lib/codeql/rust/elements/StructExprFieldList.qll 6efb2ec4889b38556dc679bb89bbd4bd76ed6a60014c41f8e232288fc23b2d52 dc867a0a4710621e04b36bbec7d317d6f360e0d6ac68b79168c8b714babde31d
@@ -168,12 +167,13 @@ lib/codeql/rust/elements/TypeAlias.qll b59f24488f0d7de8d4046a9e0ca1e1f54d1d5c11e
 lib/codeql/rust/elements/TypeArg.qll e91dbb399d2ab7cf7af9dd5f743a551d0bf91dba3cfb76cea9e2d42ada0f9f2e c67d64e20e35a9bba5092651e0f82c75ba53b8c165e823bc81d67975107ae375
 lib/codeql/rust/elements/TypeBound.qll 33583aed81734348c5097851cde3568668f259c000ccde901c75a3f2eef30237 3c9e541d47c5cfbcb0b1c5806f5d9abd7f51382d1efc1328742439e11285ab32
 lib/codeql/rust/elements/TypeBoundList.qll 61a861e89b3de23801c723531cd3331a61214817a230aaae74d91cb60f0e096f d54e3d830bb550c5ba082ccd09bc0dc4e6e44e8d11066a7afba5a7172aa687a8
+lib/codeql/rust/elements/TypeItem.qll 5676a801adccd2685c6beff4e2587b6da595ecaa9befb88dc29428eb53988a86 3bfdeb9d0cd4f79a9eb85829e9572bd1e4d0971e67cd3952ae5b811a955b26b5
 lib/codeql/rust/elements/TypeParam.qll 0787c1cc0c121e5b46f7d8e25153fd1b181bd3432eb040cf3b4ae3ed9ac2f28c 50092950f52a4e3bfd961dff4ffd8a719ef66ca1a0914bd33e26fed538321999
 lib/codeql/rust/elements/TypeRepr.qll ea41b05ef0aaac71da460f9a6a8331cf98166f2c388526068ddacbd67488c892 11a01e42dab9183bac14de1ca49131788ede99e75b0ef759efcbc7cf08524184
 lib/codeql/rust/elements/UnderscoreExpr.qll 233661b82b87c8cda16d8f2e17965658c3dc6b69efb23cb8eb9c4f50c68521e0 8edff8e80aac2ecf83a6b58f310cab688cbaeea0a0e68a298b644e565960cc74
 lib/codeql/rust/elements/Unextracted.qll 12e60c79ef5b94d72b579b19970622e7b73822ebc13fbcfedfe953527ab1ac36 ec015db2eb12c3c82693ddc71d32d9ab9ef7a958e741e2510681bb707ceca23e
 lib/codeql/rust/elements/Unimplemented.qll bf624d28163e5c99accda16c0c99f938bec4a3b1b920a463e86fc8529ff5ff02 013bc7777298d250338f835cd494b5a8accea2d6a4f9561851f283ac129a446b
-lib/codeql/rust/elements/Union.qll 13f7f62e98b117d18e79db5f6e6535447bc069ebb08f7cdb390b012678b7e085 bd8c37bc0ff09926753bc250e1848ed25923f224829d0136afc27b749eaddd1f
+lib/codeql/rust/elements/Union.qll e23ca528f8573e77dfa7eca71457e2022c92f22292ce84d021d304e52820ee66 eed20ac3797faaa248bc47ef81fa79a5d5c372b4c6289a075d041a84dd8bd6f4
 lib/codeql/rust/elements/Use.qll fdcf70574403c2f219353211b6930f2f9bc79f41c2594e07548de5a8c6cbb24d e41f2b689fcbeb7b84c7ba8d09592f7561626559318642b73574bbac83f74546
 lib/codeql/rust/elements/UseBoundGenericArg.qll f16903f8fff676d3700eaad5490804624391141472ecc3166ccb1f70c794c120 5efda98088d096b42f53ceccae78c05f15c6953525b514d849681cb2cf65b147
 lib/codeql/rust/elements/UseBoundGenericArgs.qll 841913cfbb84de14aab1820a5433eae978bbadbb8e6d413b8ba70780c7328335 c9ec9d086cff91d15c3aea64f1080b22b41cdaf64e3c8b192aaaec17604a5d10
@@ -190,7 +190,6 @@ lib/codeql/rust/elements/YeetExpr.qll 4172bf70de31cab17639da6eed4a12a7afcefd7aa9
 lib/codeql/rust/elements/YieldExpr.qll de2dc096a077f6c57bba9d1c2b2dcdbecce501333753b866d77c3ffbe06aa516 1f3e8949689c09ed356ff4777394fe39f2ed2b1e6c381fd391790da4f5d5c76a
 lib/codeql/rust/elements/internal/AbiConstructor.qll 4484538db49d7c1d31c139f0f21879fceb48d00416e24499a1d4b1337b4141ac 460818e397f2a1a8f2e5466d9551698b0e569d4640fcb87de6c4268a519b3da1
 lib/codeql/rust/elements/internal/AbiImpl.qll 28a2b6bdb38fd626e5d7d1ed29b839b95976c3a03717d840669eb17c4d6f0c7a 8e83877855abe760f3be8f45c2cf91c1f6e810ec0301313910b8104b2474d9cf
-lib/codeql/rust/elements/internal/AdtImpl.qll 2dc727a14a0fc775512d35e224eab7955884ec143dbd7dbf4cada9a1f5516df4 f3991cea544c5537b0a810492979a317b47685e1c0e58b948df2a957c7a18fdc
 lib/codeql/rust/elements/internal/ArgListConstructor.qll a73685c8792ae23a2d628e7357658efb3f6e34006ff6e9661863ef116ec0b015 0bee572a046e8dfc031b1216d729843991519d94ae66280f5e795d20aea07a22
 lib/codeql/rust/elements/internal/ArgListImpl.qll 0903b2ca31b3e5439f631582d12f17d77721d63fdb54dc41372d19b742881ce4 2c71c153ccca4b4988e6a25c37e58dc8ecb5a7483273afff563a8542f33e7949
 lib/codeql/rust/elements/internal/ArrayExprInternal.qll 07a219b3d3fba3ff8b18e77686b2f58ab01acd99e0f5d5cad5d91af937e228f5 7528fc0e2064c481f0d6cbff3835950a044e429a2cd00c4d8442d2e132560d37
@@ -415,6 +414,7 @@ lib/codeql/rust/elements/internal/TypeArgConstructor.qll 51d621e170fdf5f91497f8c
 lib/codeql/rust/elements/internal/TypeArgImpl.qll 77886af8b2c045463c4c34d781c8f618eec5f5143098548047730f73c7e4a34a 6be6c519b71f9196e0559958e85efe8a78fbce7a90ca2401d7c402e46bc865c9
 lib/codeql/rust/elements/internal/TypeBoundConstructor.qll ba99616e65cf2811187016ff23e5b0005cfd0f1123622e908ff8b560aaa5847f fde78432b55b31cf68a3acb7093256217df37539f942c4441d1b1e7bf9271d89
 lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll 4b634b3a4ca8909ce8c0d172d9258168c5271435474089902456c2e3e47ae1c5 3af74623ced55b3263c096810a685517d36b75229431b81f3bb8101294940025
+lib/codeql/rust/elements/internal/TypeItemImpl.qll e439593cfbf8fb647b69151b7a0ef2b60b7dfa4603d1a0d911b0f924997acd0c 72caab93da71a88df1c0890ae70e866dc607ce61b177243ee60afa555881c72b
 lib/codeql/rust/elements/internal/TypeParamConstructor.qll a6e57cccd6b54fa68742d7b8ce70678a79ac133ea8c1bfa89d60b5f74ad07e05 0e5f45d250d736aaf40387be22e55288543bdb55bbb20ecb43f2f056e8be8b09
 lib/codeql/rust/elements/internal/TypeReprImpl.qll 504b137313407be57c93fe0acee31716a02f91e23ce417e7c67bae2ae9937564 28fa8b680d5cd782c5c5fb048a9deb9b9debd196e3bc7df1129843e61eb342ea
 lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll 8dc27831adb49c1a47b9f8997d6065e82b4e48e41e3c35bd8d35255cea459905 6c5a5272d37f83f1c1b17475f8adb7d867e95025d201320e20a32dab1f69f7bf
@@ -445,7 +445,6 @@ lib/codeql/rust/elements/internal/YieldExprConstructor.qll 8cbfa6405acb151ee31cc
 lib/codeql/rust/elements/internal/YieldExprImpl.qll af184649a348ddd0be16dee9daae307240bf123ace09243950342e9d71ededd9 17df90f67dd51623e8a5715b344ccd8740c8fc415af092469f801b99caacb70d
 lib/codeql/rust/elements/internal/generated/Abi.qll f5a22afe5596c261b4409395056ce3227b25d67602d51d0b72734d870f614df3 06d1c242ccd31f1cc90212823077e1a7a9e93cd3771a14ebe2f0659c979f3dd1
 lib/codeql/rust/elements/internal/generated/Addressable.qll 624c380d385af6563885417d1e8ecd5d9b7abf1435c0ab79a1b9a405387874a3 e2755dc2155d6f2bc0e2d54006da0e62ee359440592db9d6a8b73202ef28e64f
-lib/codeql/rust/elements/internal/generated/Adt.qll 155f4025a26c3d2d5d3c42dfce9274a10f0862ea0574843c5d276179de421569 17138b271eea81d3ee2697c82cccfd7af752cd18cd925dd5fa20d7fce0e2432f
 lib/codeql/rust/elements/internal/generated/ArgList.qll e41f48258082876a8ceac9107209d94fdd00a62d2e4c632987a01a8394c4aff6 bf1982d14f8cd55fa0c3da2c6aab56fc73b15a3572ffc72d9a94f2c860f8f3b7
 lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 73806a0de8168b38a9436fa6b8c6d68c92eeab3d64a1ae7edfff82f871929992 7ad998cdd8f4fed226473517ad7a5765cb35608033047aad53bf8aa3969fd03b
 lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll 67a7b0fae04b11cf771727ff39a123fb2d5ce6e2d650d32478fcb33a26ed5688 15833405fa85f6abe0e5146dac283cb5a142a07f08300ccc15a1dae30ed88942
@@ -490,7 +489,7 @@ lib/codeql/rust/elements/internal/generated/ContinueExpr.qll e2010feb14fb6edeb83
 lib/codeql/rust/elements/internal/generated/Crate.qll 37f3760d7c0c1c3ca809d07daf7215a8eae6053eda05e88ed7db6e07f4db0781 649a3d7cd7ee99f95f8a4d3d3c41ea2fa848ce7d8415ccbac62977dfc9a49d35
 lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll b2e0e728b6708923b862d9d8d6104d13f572da17e393ec1485b8465e4bfdc206 4a87ea9669c55c4905ce4e781b680f674989591b0cb56af1e9fa1058c13300b3
 lib/codeql/rust/elements/internal/generated/Element.qll d56d22c060fa929464f837b1e16475a4a2a2e42d68235a014f7369bcb48431db 0e48426ca72179f675ac29aa49bbaadb8b1d27b08ad5cbc72ec5a005c291848e
-lib/codeql/rust/elements/internal/generated/Enum.qll 477eaa102c1268f0fa7603ecd88f1b83db1388c17c25e3719d4113ea980256f7 2d60db61ba4a385218f0a01e366e04ba1e7dad386b7e6a027c31f32fb730cca2
+lib/codeql/rust/elements/internal/generated/Enum.qll 3ed69005ab7cf68745a67cc9891bd68a83f6ab927febf077de9e4092cb373b0b 604fd03d1c46884b3c93e5bff3951ec41593320e1f7382c1a7143a64063827bc
 lib/codeql/rust/elements/internal/generated/Expr.qll 5fa34f2ed21829a1509417440dae42d416234ff43433002974328e7aabb8f30f 46f3972c7413b7db28a3ea8acb5a50a74b6dd9b658e8725f6953a8829ac912f8
 lib/codeql/rust/elements/internal/generated/ExprStmt.qll d1112230015fbeb216b43407a268dc2ccd0f9e0836ab2dca4800c51b38fa1d7d 4a80562dcc55efa5e72c6c3b1d6747ab44fe494e76faff2b8f6e9f10a4b08b5b
 lib/codeql/rust/elements/internal/generated/ExternBlock.qll e7faac92297a53ac6e0420eec36255a54f360eeb962bf663a00da709407832dd 5ff32c54ec7097d43cc3311492090b9b90f411eead3bc849f258858f29405e81
@@ -563,7 +562,7 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll eaa0cd4402d3665013d47e
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll 812d2ff65079277f39f15c084657a955a960a7c1c0e96dd60472a58d56b945eb eb8c607f43e1fcbb41f37a10de203a1db806690e10ff4f04d48ed874189cb0eb
 lib/codeql/rust/elements/internal/generated/ParenPat.qll 24f9dc7fce75827d6fddb856cd48f80168143151b27295c0bab6db5a06567a09 ebadbc6f5498e9ed754b39893ce0763840409a0721036a25b56e1ead7dcc09aa
 lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll 03f5c5b96a37adeb845352d7fcea3e098da9050e534972d14ac0f70d60a2d776 ed3d6e5d02086523087adebce4e89e35461eb95f2a66d1d4100fe23fc691b126
-lib/codeql/rust/elements/internal/generated/ParentChild.qll 8a6e4335bcf6f7d72f5ed6ffba5448ae88b00323fe7dac6f406c8746c03ef2dc 867a0fb166b53d7a8218a02d671f117ba7ea4e67cb16abeea6e746dc5823b85e
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 2a7dd6ec90e4d557b36704a04bb9eb4191469126f960c52827e12c90e51c5343 37781e023a93982be30c9d80aee7c6d87d52cc934705db66f838604563391f95
 lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll d901fdc8142a5b8847cc98fc2afcfd16428b8ace4fbffb457e761b5fd3901a77 5dbb0aea5a13f937da666ccb042494af8f11e776ade1459d16b70a4dd193f9fb
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 9b12afb46fc5a9ad3a811b05472621bbecccb900c47504feb7f29d96b28421ca bcacbffc36fb3e0c9b26523b5963af0ffa9fd6b19f00a2a31bdb2316071546bd
@@ -578,7 +577,7 @@ lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll 8d0ea4f6c7f8203340bf
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
 lib/codeql/rust/elements/internal/generated/RangePat.qll 80826a6a6868a803aa2372e31c52a03e1811a3f1f2abdb469f91ca0bfdd9ecb6 34ee1e208c1690cba505dff2c588837c0cd91e185e2a87d1fe673191962276a9
-lib/codeql/rust/elements/internal/generated/Raw.qll f207067167f8597ddf6de483372fc9e281d1661d3fc0a5da0d6d6bd7e32aa9c7 1c27c65c3ab4d07553bbd269c6737576feca3f5c29c8b02f81a0d65c209d4621
+lib/codeql/rust/elements/internal/generated/Raw.qll 22bb3aa871d1dcac60bfa46393da911f95467065e52bb78981d17469c7854c93 3ccc518319d79f3c8d9e9901a5665ab4c889253781edf76fcbc3de64dff91069
 lib/codeql/rust/elements/internal/generated/RefExpr.qll 7d995884e3dc1c25fc719f5d7253179344d63650e217e9ff6530285fe7a57f64 f2c3c12551deea4964b66553fb9b6423ee16fec53bd63db4796191aa60dc6c66
 lib/codeql/rust/elements/internal/generated/RefPat.qll 456ede39837463ee22a630ec7ab6c8630d3664a8ea206fcc6e4f199e92fa564c 5622062765f32930465ba6b170e986706f159f6070f48adee3c20e24e8df4e05
 lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll 5b0663a6d234572fb3e467e276d019415caa95ef006438cc59b7af4e1783161e 0e27c8a8f0e323c0e4d6db01fca821bf07c0864d293cdf96fa891b10820c1e4b
@@ -594,7 +593,7 @@ lib/codeql/rust/elements/internal/generated/SourceFile.qll 4bc95c88b49868d1da1a8
 lib/codeql/rust/elements/internal/generated/Static.qll 1a6c87d3c5602e3d02268ebe2463a4ac64614ad25e8966a9bdb9c0ef58991365 cc1fe16d70cdce41a12e41a8f80cc38bdd7efa49c1544e35342fcf3cd26b8219
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
 lib/codeql/rust/elements/internal/generated/StmtList.qll 834b87cd93f0c5b41736fb52a6c25fd0e3bdce41d5a64cb3d0810c54e90507f4 ec42f2dfa322044ceaaf90d278f0e7e751d63710facbaf3f5ee69ca3c64ecd06
-lib/codeql/rust/elements/internal/generated/Struct.qll 999da1b46e40d6e03fd2338fea02429462877c329c5d1338618cbd886a81567e daa7ff7bd32c554462e0a1502d8319cb5e734e056d0564e06596e416e2b88e9d
+lib/codeql/rust/elements/internal/generated/Struct.qll 56775b98f793c108bd0eb8f35dbbc4983c170138e92c7378c24f45d2e612ca39 7bd83f2686f2f7a6b55b82156028c1951fde4c3ac9fc0248b1bb28f35b949fd4
 lib/codeql/rust/elements/internal/generated/StructExpr.qll e77702890561102af38f52d836729e82569c964f8d4c7e680b27992c1ff0f141 23dc51f68107ab0e5c9dd88a6bcc85bb66e8e0f4064cb4d416f50f2ba5db698c
 lib/codeql/rust/elements/internal/generated/StructExprField.qll 6bdc52ed325fd014495410c619536079b8c404e2247bd2435aa7685dd56c3833 501a30650cf813176ff325a1553da6030f78d14be3f84fea6d38032f4262c6b0
 lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll 298d33442d1054922d2f97133a436ee559f1f35b7708523284d1f7eee7ebf443 7febe38a79fadf3dcb53fb8f8caf4c2780f5df55a1f8336269c7b674d53c6272
@@ -603,7 +602,7 @@ lib/codeql/rust/elements/internal/generated/StructFieldList.qll 5da528a51a6a5db9
 lib/codeql/rust/elements/internal/generated/StructPat.qll c76fa005c2fd0448a8803233e1e8818c4123301eb66ac5cf69d0b9eaafc61e98 6e0dffccdce24bca20e87d5ba0f0995c9a1ae8983283e71e7dbfcf6fffc67a58
 lib/codeql/rust/elements/internal/generated/StructPatField.qll 5b5c7302dbc4a902ca8e69ff31875c867e295a16a626ba3cef29cd0aa248f179 4e192a0df79947f5cb0d47fdbbba7986137a6a40a1be92ae119873e2fad67edf
 lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll 1a95a1bd9f64fb18e9571657cf2d02a8b13c747048a1f0f74baf31b91f0392ad fc274e414ff4ed54386046505920de92755ad0b4d39a7523cdffa4830bd53b37
-lib/codeql/rust/elements/internal/generated/Synth.qll 61147c264e863dc5234b391ad2b7a01e0a2fe99e18ea237ba06e31340fd0a50a 6d33624a9b571d05aba1e9459a211f75b762e72fa716259abcd994f5098e15a6
+lib/codeql/rust/elements/internal/generated/Synth.qll 00f19e9d0a03b9d8e42caceda06da69d67280be16f67f3459f0adec8f9f8cacd ebcc049fe946540277893bf095787c061cd119c9d4eb708cec9df93257780e8d
 lib/codeql/rust/elements/internal/generated/SynthConstructors.qll f41abfc73415b7accb38da7c107faebfe6843c270ad54e0e54a96e930dfe479a f41abfc73415b7accb38da7c107faebfe6843c270ad54e0e54a96e930dfe479a
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
 lib/codeql/rust/elements/internal/generated/TokenTree.qll 1a3c4f5f30659738641abdd28cb793dab3cfde484196b59656fc0a2767e53511 de2ebb210c7759ef7a6f7ee9f805e1cac879221287281775fc80ba34a5492edf
@@ -620,12 +619,13 @@ lib/codeql/rust/elements/internal/generated/TypeAlias.qll 0d0c97d9e9213b8f0390b3
 lib/codeql/rust/elements/internal/generated/TypeArg.qll 80245e4b52bef30e5033d4c765c72531324385deea1435dc623290271ff05b1d 097926e918dcd897ea1609010c5490dbf45d4d8f4cffb9166bcadf316a2f1558
 lib/codeql/rust/elements/internal/generated/TypeBound.qll ed27681b76b8f3ad790daad4a08f3bc243452821246bcb240b1d925bc1c362a3 8fdc0caf91f1894d8711d68547185eb029446898b66f60fc0d10ef862cd6292e
 lib/codeql/rust/elements/internal/generated/TypeBoundList.qll c5d43dc27075a0d5370ba4bc56b4e247357af5d2989625deff284e7846a3a48b c33c87d080e6eb6df01e98b8b0031d780472fcaf3a1ed156a038669c0e05bf0a
+lib/codeql/rust/elements/internal/generated/TypeItem.qll 940b197a06b11621db980ae8ff8c0c6684cebeff62987ad8267f3838aa768d0a ab0e3b6e23acd1970ea4e2a32bef3cced27072ec9c5d16428626ec2632b33d14
 lib/codeql/rust/elements/internal/generated/TypeParam.qll 81a8d39f1e227de031187534e5d8e2c34f42ad3433061d686cadfbdd0df54285 893795d62b5b89997574e9057701d308bea2c4dca6053042c5308c512137e697
 lib/codeql/rust/elements/internal/generated/TypeRepr.qll 1e7b9d2ddab86e35dad7c31a6453a2a60747420f8bc2e689d5163cab4fec71bb eb80e3947649e511e7f3555ffc1fd87199e7a32624449ca80ffad996cdf9e2f3
 lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll b3780c99c5d57159bef4c6bd2fd8ec44ebd1854c892c1ca776c740f71249e58c 2fd451cbf0a779e8042e439882e7d9cadc19d1e596df3bbb086d16f2596407c7
 lib/codeql/rust/elements/internal/generated/Unextracted.qll 01563dfd769d6dc3c6b8a40d9a4dc0d99a3b6a0c6725c180d2bf4d7633929a17 a93ce90f8c03f4305e59de9c63f089fc7935298fc9a73d091d76933cf63e790c
 lib/codeql/rust/elements/internal/generated/Unimplemented.qll a3eb304781991bff1227de1e4422b68bf91e7b344e4f6c9e874b324e82a35e60 6bc4839fda3850a56dc993b79ef9ba921008395c8432b184e14438fba4566f21
-lib/codeql/rust/elements/internal/generated/Union.qll 456504e6a32991ba17ca65f97636f4dfb86c758c7f8509aaca1b0d0432231dfe c96068edfec3e0755a7726426a10996455ee9f0f2d678af258719f1943a3063e
+lib/codeql/rust/elements/internal/generated/Union.qll 4df8fc632f7bcc0cbd564cd1c148c1a2438f26e6a83cd6470e15870120f677fe c74dea0a4ddfd581b9208d7907ea134219cafd217294315acf5c595de38a61f3
 lib/codeql/rust/elements/internal/generated/Use.qll cf95b5c4756b25bee74113207786e37464ffbc0fb5f776a04c651300afc53753 1fe26b3904db510184cb688cb0eeb0a8dbac7ac15e27a3b572d839743c738393
 lib/codeql/rust/elements/internal/generated/UseBoundGenericArg.qll 69162794e871291545ea04f61259b2d000671a96f7ca129f7dd9ed6e984067c4 31de9ebc0634b38e2347e0608b4ea888892f1f2732a2892464078cd8a07b4ee8
 lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll cedde7ccf689e3a2a246113be94544c206c56fb1c01b83b074e1f6edd3acfced f022ea4c653d1b5f311917efde8e59be27394ce7f6abf2561bb1e42f93f74adf
@@ -640,7 +640,7 @@ lib/codeql/rust/elements/internal/generated/WhileExpr.qll 0353aab87c49569e1fbf58
 lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae017a329352a5b27a6b9e73dd5521d627f680e810c6c59e 4b913b548ba27ff3c82fcd32cf996ff329cb57d176d3bebd0fcef394486ea499
 lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b
 lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85
-lib/codeql/rust/elements.qll 5cc722db81259ee5d5b9cbed1a4d2795060ad996c80fd7121e7ce43dc392b62f 5cc722db81259ee5d5b9cbed1a4d2795060ad996c80fd7121e7ce43dc392b62f
+lib/codeql/rust/elements.qll 47adb2b43274ce791299d1e94299e560f392f75d2cc4d4ace02e29f31a7db4af 47adb2b43274ce791299d1e94299e560f392f75d2cc4d4ace02e29f31a7db4af
 test/extractor-tests/generated/Abi/Abi.ql 086ed104ab1a7e7fe5c1ed29e03f1719a797c7096c738868bf6ebe872ab8fdaa fe23fe67ab0d9201e1177ea3f844b18ed428e13e3ce77381bf2b6910adfa3a0e
 test/extractor-tests/generated/ArgList/ArgList.ql da97b5b25418b2aa8cb8df793f48870c89fa00759cdade8ddba60d7f1f4bbc01 acfd5d2caf67282ad2d57b961068472100482d0f770a52a3c00214c647d18c75
 test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql 42b365276aa43e2cad588338463542d3ce1dd0db3a428621554584b07a1431d5 08a66a8b69af35ee3bc64c35c453a19a6c9881cc6cc7e65275d1fff056121270
@@ -677,7 +677,7 @@ test/extractor-tests/generated/ConstParam/ConstParam.ql 6facb2402e1cbf23d836f619
 test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 58b5046a4da06a4cd2d942720603313126888b2249b218bef6f7c44ca469ccfa eeb84a04deb4c4496b7f9b38798cc7fdc179a486c8beaa0b33bf87e7f9482b1a
 test/extractor-tests/generated/Crate/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql ff54195d2e09424faaac4e145a40208bf0e57acc57dfa8247b3751862a317c4b 583d5b98aa31a9af6ad73df000ca529f57f67aa6daaa50ca5673a56eb57bf507
-test/extractor-tests/generated/Enum/Enum.ql 64ed7f25aaf5eff67687cd3aa2690017fb6f9651c959aed7b655d486be0e0c5b 1df131d8e12c4594715ed31191e960792c21727b403dce59207c514671e88d62
+test/extractor-tests/generated/Enum/Enum.ql 9a612c818952e867e2665d8c919905d563bb76191f3f522370c7344863589205 c32cf1973082f5d519e3eb04fca0309b3dd9637cf34e58c10a8e34cd9fe36d2d
 test/extractor-tests/generated/ExprStmt/ExprStmt.ql 7c62a97f7f910ae6e0e9aff7fdd78b369d21257ccab52afe6307ddea2e15dad1 2d32a366c4acbea3136ff1f9f9dadf76b148f82ad1d7170f02efd977d8a07ae9
 test/extractor-tests/generated/ExternBlock/ExternBlock.ql b61e37f1c387bc91be127b5425089f9f1d687f4f1708cad334c0bb00dba5bae3 dc03f0f0912b2cfbce74c3bc31d261cdbea740847212ac3472ecf719d8eb71f7
 test/extractor-tests/generated/ExternCrate/ExternCrate.ql 55d2d9d32cb5e894cc2ee5242d688aaa8428ba7757cccea67d1c064db6de2514 46a2c57660a42ee6eaa532b0c86f4cc2d3de795c33ee7cadbff650bd0f23206b
@@ -761,7 +761,7 @@ test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql a009f2ba47f3b082db
 test/extractor-tests/generated/SourceFile/SourceFile.ql 19ae5570a88b9e2d82db66685a31b01cc8e0c86c622a4bfaabe8c5b397b27eea 60e2ba5eb82518d6408254fb4ec01277b6c6c0e4316d4f3cdc809da9c32c4a57
 test/extractor-tests/generated/Static/Static.ql ec2e5cf081453bbae16216d1250f5d8324be81d1d6ad8744e969934d2ef21b0d 7bde1afbafdc16f9c999e902626c77dc0efe3f1b3d687e9fe1a3e9db6b1f62a9
 test/extractor-tests/generated/StmtList/StmtList.ql 4c6b9d5d8fd7535f97d81b968d4f67fc50e10c5d0f980e7c2704bbf5cd07481e ad972adb8d9a7892e6f8a12d96649340441f947afc99e633ea438c4d5c795ce4
-test/extractor-tests/generated/Struct/Struct.ql 846ef41cb4dfbe94f495fd68de26a68609e7b5ab0830d6ee844a67afea3ac591 6799a1246da45ecbf1f1040ffb7d1a5578ab9e236cce3029e6cc17c93b3bf138
+test/extractor-tests/generated/Struct/Struct.ql 57e837e3c665d24870d99492c8874441ce1445b314863ae405cc6f721d2ac14c ddeee05945e91356a1dc66976ef4830230b1c024ace02f974ff42c8193fd3464
 test/extractor-tests/generated/StructExpr/StructExpr.ql 3b98205260e750cc7adc42b318deef2854cc3b4f921cbcfffc6d701553af3903 368bccf01db2fa069dca30d9fb0878f8e6a88d4ce58b333b24a18620933e4c91
 test/extractor-tests/generated/StructExprField/StructExprField.ql b65375963aa24f0d1dd4c10784e32ab8c337ad431462ea1d081a0e456fbb1362 7f5a49e8df03ed0890b51c2e941d636fbbf70445a53d3af2c0f34a04f26bc6ef
 test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql 01dc3ef66d79836a3d372464f05454015648ab093f9547c5d9c5d55271acb718 83625301c097fa38d4e6021ea28b8adc6338076c8c2aa88a86a22aac412839f6
@@ -787,7 +787,7 @@ test/extractor-tests/generated/TypeBound/TypeBound.ql 41d0a7b6538de12797c5aa4152
 test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql 6827529eca62f5e7be87538af6231099f5932f39d8694f7a76369273b93f28ea 539dac4ccda7e51b7ae1a9e05d8a56a98176d9de25d5ed4347ebe2fbea8adeb1
 test/extractor-tests/generated/TypeParam/TypeParam.ql c5f8f62f2877c719c3cf069f9d0ca83cebc14f7611c6c2dce86c85114ea2635c 751c630986f35a8d0d32fbeb61ca6ff801c96cd1829dbccc874fbf5f5158e98d
 test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql a7b7a93104fff28515154cf8e79045d3eea2494b5c46f1caf36639c53b1c64a7 070ee2e1664e3291646ea56681b5c93331f94dcc519deb28622beca3e26e16f3
-test/extractor-tests/generated/Union/Union.ql 71e367ea4b541ee4ae831c69d0dfa2d1ba0c2d3dd9e9aba770dd00fd1f546ef8 61dbc6364a9f486d0de8c27cacbb9d1027282d92f89058e93e2c376588d809f9
+test/extractor-tests/generated/Union/Union.ql 427757ef5aa4e95fde8f5047263cbbbc7e2614f9efabc51c9a5f9ba8d9b68310 d1d8840a4324e5727e1ecf6e696741e902b807b39ec82686b94211803eb2d0ba
 test/extractor-tests/generated/Use/Use.ql 1f084f3b49c910c6e01d2a81be2443e84c2836a5855b89874965efaf25d17511 d5bf37ba65f4d280312ca798bae22d2735c00cf91ff05ed6321f69b76b4551bc
 test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.ql 46ff2cf0fc8b561b21f8dff3230550f2feafbe52a7ea8b28bf183abef94ff241 92646f3bd15a8cf4c23ee9de4d857ac5c147e570ef0eb223423a109b4b79aedf
 test/extractor-tests/generated/UseTree/UseTree.ql 3c2bc924b54b9af5c95784023d4098924571ba464c5982124acea712c3ce0e93 8d9f963b61a9a8a83efd93438ce8b43d4aa763493338ad9afd2a3dc7a440892d
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index 22c7d3a15498..dd6ca829eede 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -3,7 +3,6 @@
 /lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll linguist-generated
 /lib/codeql/rust/elements/Abi.qll linguist-generated
 /lib/codeql/rust/elements/Addressable.qll linguist-generated
-/lib/codeql/rust/elements/Adt.qll linguist-generated
 /lib/codeql/rust/elements/ArgList.qll linguist-generated
 /lib/codeql/rust/elements/ArrayExpr.qll linguist-generated
 /lib/codeql/rust/elements/ArrayListExpr.qll linguist-generated
@@ -170,6 +169,7 @@
 /lib/codeql/rust/elements/TypeArg.qll linguist-generated
 /lib/codeql/rust/elements/TypeBound.qll linguist-generated
 /lib/codeql/rust/elements/TypeBoundList.qll linguist-generated
+/lib/codeql/rust/elements/TypeItem.qll linguist-generated
 /lib/codeql/rust/elements/TypeParam.qll linguist-generated
 /lib/codeql/rust/elements/TypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/UnderscoreExpr.qll linguist-generated
@@ -192,7 +192,6 @@
 /lib/codeql/rust/elements/YieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/AbiConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/AbiImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/AdtImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArgListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArgListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArrayExprInternal.qll linguist-generated
@@ -417,6 +416,7 @@
 /lib/codeql/rust/elements/internal/TypeArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeBoundConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeItemImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll linguist-generated
@@ -447,7 +447,6 @@
 /lib/codeql/rust/elements/internal/YieldExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Abi.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Addressable.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/Adt.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ArgList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ArrayExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll linguist-generated
@@ -622,6 +621,7 @@
 /lib/codeql/rust/elements/internal/generated/TypeArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeBound.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeBoundList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TypeItem.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll linguist-generated
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index 9c7d0be306fb..1377c543f787 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -6,7 +6,6 @@
 import codeql.files.FileSystem
 import codeql.rust.elements.Abi
 import codeql.rust.elements.Addressable
-import codeql.rust.elements.Adt
 import codeql.rust.elements.ArgList
 import codeql.rust.elements.ArrayExpr
 import codeql.rust.elements.ArrayListExpr
@@ -173,6 +172,7 @@ import codeql.rust.elements.TypeAlias
 import codeql.rust.elements.TypeArg
 import codeql.rust.elements.TypeBound
 import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeItem
 import codeql.rust.elements.TypeParam
 import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.UnderscoreExpr
diff --git a/rust/ql/lib/codeql/rust/elements/Adt.qll b/rust/ql/lib/codeql/rust/elements/Adt.qll
deleted file mode 100644
index c8fa30d743db..000000000000
--- a/rust/ql/lib/codeql/rust/elements/Adt.qll
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `Adt`.
- */
-
-private import internal.AdtImpl
-import codeql.rust.elements.Item
-import codeql.rust.elements.MacroItems
-
-/**
- * An ADT (Abstract Data Type) definition, such as `Struct`, `Enum`, or `Union`.
- */
-final class Adt = Impl::Adt;
diff --git a/rust/ql/lib/codeql/rust/elements/Enum.qll b/rust/ql/lib/codeql/rust/elements/Enum.qll
index 9d52b558f538..9bad986cef51 100644
--- a/rust/ql/lib/codeql/rust/elements/Enum.qll
+++ b/rust/ql/lib/codeql/rust/elements/Enum.qll
@@ -4,13 +4,8 @@
  */
 
 private import internal.EnumImpl
-import codeql.rust.elements.Adt
-import codeql.rust.elements.Attr
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.Name
+import codeql.rust.elements.TypeItem
 import codeql.rust.elements.VariantList
-import codeql.rust.elements.Visibility
-import codeql.rust.elements.WhereClause
 
 /**
  * An enum declaration.
diff --git a/rust/ql/lib/codeql/rust/elements/Struct.qll b/rust/ql/lib/codeql/rust/elements/Struct.qll
index 7627f866f058..fb9bec418da8 100644
--- a/rust/ql/lib/codeql/rust/elements/Struct.qll
+++ b/rust/ql/lib/codeql/rust/elements/Struct.qll
@@ -4,13 +4,8 @@
  */
 
 private import internal.StructImpl
-import codeql.rust.elements.Adt
-import codeql.rust.elements.Attr
 import codeql.rust.elements.FieldList
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.Name
-import codeql.rust.elements.Visibility
-import codeql.rust.elements.WhereClause
+import codeql.rust.elements.TypeItem
 
 /**
  * A Struct. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/TypeItem.qll b/rust/ql/lib/codeql/rust/elements/TypeItem.qll
new file mode 100644
index 000000000000..48d22478df05
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TypeItem.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TypeItem`.
+ */
+
+private import internal.TypeItemImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.MacroItems
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * An item that defines a type. Either a `Struct`, `Enum`, or `Union`.
+ */
+final class TypeItem = Impl::TypeItem;
diff --git a/rust/ql/lib/codeql/rust/elements/Union.qll b/rust/ql/lib/codeql/rust/elements/Union.qll
index 988a1cf97997..4fc8584c9fe3 100644
--- a/rust/ql/lib/codeql/rust/elements/Union.qll
+++ b/rust/ql/lib/codeql/rust/elements/Union.qll
@@ -4,13 +4,8 @@
  */
 
 private import internal.UnionImpl
-import codeql.rust.elements.Adt
-import codeql.rust.elements.Attr
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.Name
 import codeql.rust.elements.StructFieldList
-import codeql.rust.elements.Visibility
-import codeql.rust.elements.WhereClause
+import codeql.rust.elements.TypeItem
 
 /**
  * A union declaration.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AdtImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeItemImpl.qll
similarity index 56%
rename from rust/ql/lib/codeql/rust/elements/internal/AdtImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/TypeItemImpl.qll
index 2243aed17a34..df7ebbcbbca0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AdtImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeItemImpl.qll
@@ -1,19 +1,19 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `Adt`.
+ * This module provides a hand-modifiable wrapper around the generated class `TypeItem`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.Adt
+private import codeql.rust.elements.internal.generated.TypeItem
 
 /**
- * INTERNAL: This module contains the customizable definition of `Adt` and should not
+ * INTERNAL: This module contains the customizable definition of `TypeItem` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * An ADT (Abstract Data Type) definition, such as `Struct`, `Enum`, or `Union`.
+   * An item that defines a type. Either a `Struct`, `Enum`, or `Union`.
    */
-  class Adt extends Generated::Adt { }
+  class TypeItem extends Generated::TypeItem { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Adt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Adt.qll
deleted file mode 100644
index 385e3930fb89..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Adt.qll
+++ /dev/null
@@ -1,45 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `Adt`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
-import codeql.rust.elements.MacroItems
-
-/**
- * INTERNAL: This module contains the fully generated definition of `Adt` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * An ADT (Abstract Data Type) definition, such as `Struct`, `Enum`, or `Union`.
-   * INTERNAL: Do not reference the `Generated::Adt` class directly.
-   * Use the subclass `Adt`, where the following predicates are available.
-   */
-  class Adt extends Synth::TAdt, ItemImpl::Item {
-    /**
-     * Gets the `index`th derive macro expansion of this adt (0-based).
-     */
-    MacroItems getDeriveMacroExpansion(int index) {
-      result =
-        Synth::convertMacroItemsFromRaw(Synth::convertAdtToRaw(this)
-              .(Raw::Adt)
-              .getDeriveMacroExpansion(index))
-    }
-
-    /**
-     * Gets any of the derive macro expansions of this adt.
-     */
-    final MacroItems getADeriveMacroExpansion() { result = this.getDeriveMacroExpansion(_) }
-
-    /**
-     * Gets the number of derive macro expansions of this adt.
-     */
-    final int getNumberOfDeriveMacroExpansions() {
-      result = count(int i | exists(this.getDeriveMacroExpansion(i)))
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Enum.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Enum.qll
index b829ead848cc..35ff29361bc1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Enum.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Enum.qll
@@ -6,13 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.AdtImpl::Impl as AdtImpl
-import codeql.rust.elements.Attr
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.Name
+import codeql.rust.elements.internal.TypeItemImpl::Impl as TypeItemImpl
 import codeql.rust.elements.VariantList
-import codeql.rust.elements.Visibility
-import codeql.rust.elements.WhereClause
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Enum` and should not
@@ -29,53 +24,9 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Enum` class directly.
    * Use the subclass `Enum`, where the following predicates are available.
    */
-  class Enum extends Synth::TEnum, AdtImpl::Adt {
+  class Enum extends Synth::TEnum, TypeItemImpl::TypeItem {
     override string getAPrimaryQlClass() { result = "Enum" }
 
-    /**
-     * Gets the `index`th attr of this enum (0-based).
-     */
-    Attr getAttr(int index) {
-      result = Synth::convertAttrFromRaw(Synth::convertEnumToRaw(this).(Raw::Enum).getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this enum.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this enum.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
-    /**
-     * Gets the generic parameter list of this enum, if it exists.
-     */
-    GenericParamList getGenericParamList() {
-      result =
-        Synth::convertGenericParamListFromRaw(Synth::convertEnumToRaw(this)
-              .(Raw::Enum)
-              .getGenericParamList())
-    }
-
-    /**
-     * Holds if `getGenericParamList()` exists.
-     */
-    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
-
-    /**
-     * Gets the name of this enum, if it exists.
-     */
-    Name getName() {
-      result = Synth::convertNameFromRaw(Synth::convertEnumToRaw(this).(Raw::Enum).getName())
-    }
-
-    /**
-     * Holds if `getName()` exists.
-     */
-    final predicate hasName() { exists(this.getName()) }
-
     /**
      * Gets the variant list of this enum, if it exists.
      */
@@ -88,31 +39,5 @@ module Generated {
      * Holds if `getVariantList()` exists.
      */
     final predicate hasVariantList() { exists(this.getVariantList()) }
-
-    /**
-     * Gets the visibility of this enum, if it exists.
-     */
-    Visibility getVisibility() {
-      result =
-        Synth::convertVisibilityFromRaw(Synth::convertEnumToRaw(this).(Raw::Enum).getVisibility())
-    }
-
-    /**
-     * Holds if `getVisibility()` exists.
-     */
-    final predicate hasVisibility() { exists(this.getVisibility()) }
-
-    /**
-     * Gets the where clause of this enum, if it exists.
-     */
-    WhereClause getWhereClause() {
-      result =
-        Synth::convertWhereClauseFromRaw(Synth::convertEnumToRaw(this).(Raw::Enum).getWhereClause())
-    }
-
-    /**
-     * Holds if `getWhereClause()` exists.
-     */
-    final predicate hasWhereClause() { exists(this.getWhereClause()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
index 9d6ec74a53e5..2b51f6146194 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -2656,7 +2656,7 @@ private module Impl {
   private Element getImmediateChildOfEnum(Enum e, int index, string partialPredicateCall) {
     exists(
       int n, int nAttributeMacroExpansion, int nDeriveMacroExpansion, int nAttr,
-      int nGenericParamList, int nName, int nVariantList, int nVisibility, int nWhereClause
+      int nGenericParamList, int nName, int nVisibility, int nWhereClause, int nVariantList
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
@@ -2664,9 +2664,9 @@ private module Impl {
       nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
-      nVariantList = nName + 1 and
-      nVisibility = nVariantList + 1 and
+      nVisibility = nName + 1 and
       nWhereClause = nVisibility + 1 and
+      nVariantList = nWhereClause + 1 and
       (
         none()
         or
@@ -2687,15 +2687,15 @@ private module Impl {
         or
         index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getVariantList() and partialPredicateCall = "VariantList()"
-        or
-        index = nVariantList and
-        result = e.getVisibility() and
-        partialPredicateCall = "Visibility()"
+        index = nName and result = e.getVisibility() and partialPredicateCall = "Visibility()"
         or
         index = nVisibility and
         result = e.getWhereClause() and
         partialPredicateCall = "WhereClause()"
+        or
+        index = nWhereClause and
+        result = e.getVariantList() and
+        partialPredicateCall = "VariantList()"
       )
     )
   }
@@ -2862,18 +2862,18 @@ private module Impl {
 
   private Element getImmediateChildOfStruct(Struct e, int index, string partialPredicateCall) {
     exists(
-      int n, int nAttributeMacroExpansion, int nDeriveMacroExpansion, int nAttr, int nFieldList,
-      int nGenericParamList, int nName, int nVisibility, int nWhereClause
+      int n, int nAttributeMacroExpansion, int nDeriveMacroExpansion, int nAttr,
+      int nGenericParamList, int nName, int nVisibility, int nWhereClause, int nFieldList
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
       nDeriveMacroExpansion = nAttributeMacroExpansion + e.getNumberOfDeriveMacroExpansions() and
       nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
-      nFieldList = nAttr + 1 and
-      nGenericParamList = nFieldList + 1 and
+      nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
       nVisibility = nName + 1 and
       nWhereClause = nVisibility + 1 and
+      nFieldList = nWhereClause + 1 and
       (
         none()
         or
@@ -2888,9 +2888,7 @@ private module Impl {
         result = e.getAttr(index - nDeriveMacroExpansion) and
         partialPredicateCall = "Attr(" + (index - nDeriveMacroExpansion).toString() + ")"
         or
-        index = nAttr and result = e.getFieldList() and partialPredicateCall = "FieldList()"
-        or
-        index = nFieldList and
+        index = nAttr and
         result = e.getGenericParamList() and
         partialPredicateCall = "GenericParamList()"
         or
@@ -2901,6 +2899,8 @@ private module Impl {
         index = nVisibility and
         result = e.getWhereClause() and
         partialPredicateCall = "WhereClause()"
+        or
+        index = nWhereClause and result = e.getFieldList() and partialPredicateCall = "FieldList()"
       )
     )
   }
@@ -2955,7 +2955,7 @@ private module Impl {
   private Element getImmediateChildOfUnion(Union e, int index, string partialPredicateCall) {
     exists(
       int n, int nAttributeMacroExpansion, int nDeriveMacroExpansion, int nAttr,
-      int nGenericParamList, int nName, int nStructFieldList, int nVisibility, int nWhereClause
+      int nGenericParamList, int nName, int nVisibility, int nWhereClause, int nStructFieldList
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
@@ -2963,9 +2963,9 @@ private module Impl {
       nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
-      nStructFieldList = nName + 1 and
-      nVisibility = nStructFieldList + 1 and
+      nVisibility = nName + 1 and
       nWhereClause = nVisibility + 1 and
+      nStructFieldList = nWhereClause + 1 and
       (
         none()
         or
@@ -2986,17 +2986,15 @@ private module Impl {
         or
         index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and
-        result = e.getStructFieldList() and
-        partialPredicateCall = "StructFieldList()"
-        or
-        index = nStructFieldList and
-        result = e.getVisibility() and
-        partialPredicateCall = "Visibility()"
+        index = nName and result = e.getVisibility() and partialPredicateCall = "Visibility()"
         or
         index = nVisibility and
         result = e.getWhereClause() and
         partialPredicateCall = "WhereClause()"
+        or
+        index = nWhereClause and
+        result = e.getStructFieldList() and
+        partialPredicateCall = "StructFieldList()"
       )
     )
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index 7682b4b99f4e..5cc81a8777bf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -5958,26 +5958,6 @@ module Raw {
     )
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * An ADT (Abstract Data Type) definition, such as `Struct`, `Enum`, or `Union`.
-   */
-  class Adt extends @adt, Item {
-    /**
-     * Gets the `index`th derive macro expansion of this adt (0-based).
-     */
-    MacroItems getDeriveMacroExpansion(int index) {
-      adt_derive_macro_expansions(this, index, result)
-    }
-
-    /**
-     * Gets the number of derive macro expansions of this adt.
-     */
-    int getNumberOfDeriveMacroExpansions() {
-      result = count(int i | adt_derive_macro_expansions(this, i, _))
-    }
-  }
-
   /**
    * INTERNAL: Do not use.
    * An inline assembly expression. For example:
@@ -6824,6 +6804,56 @@ module Raw {
     )
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * An item that defines a type. Either a `Struct`, `Enum`, or `Union`.
+   */
+  class TypeItem extends @type_item, Item {
+    /**
+     * Gets the `index`th derive macro expansion of this type item (0-based).
+     */
+    MacroItems getDeriveMacroExpansion(int index) {
+      type_item_derive_macro_expansions(this, index, result)
+    }
+
+    /**
+     * Gets the number of derive macro expansions of this type item.
+     */
+    int getNumberOfDeriveMacroExpansions() {
+      result = count(int i | type_item_derive_macro_expansions(this, i, _))
+    }
+
+    /**
+     * Gets the `index`th attr of this type item (0-based).
+     */
+    Attr getAttr(int index) { type_item_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this type item.
+     */
+    int getNumberOfAttrs() { result = count(int i | type_item_attrs(this, i, _)) }
+
+    /**
+     * Gets the generic parameter list of this type item, if it exists.
+     */
+    GenericParamList getGenericParamList() { type_item_generic_param_lists(this, result) }
+
+    /**
+     * Gets the name of this type item, if it exists.
+     */
+    Name getName() { type_item_names(this, result) }
+
+    /**
+     * Gets the visibility of this type item, if it exists.
+     */
+    Visibility getVisibility() { type_item_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this type item, if it exists.
+     */
+    WhereClause getWhereClause() { type_item_where_clauses(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A `use` statement. For example:
@@ -6992,49 +7022,19 @@ module Raw {
    * enum E {A, B(i32), C {x: i32}}
    * ```
    */
-  class Enum extends @enum, Adt {
+  class Enum extends @enum, TypeItem {
     override string toString() { result = "Enum" }
 
-    /**
-     * Gets the `index`th attr of this enum (0-based).
-     */
-    Attr getAttr(int index) { enum_attrs(this, index, result) }
-
-    /**
-     * Gets the number of attrs of this enum.
-     */
-    int getNumberOfAttrs() { result = count(int i | enum_attrs(this, i, _)) }
-
-    /**
-     * Gets the generic parameter list of this enum, if it exists.
-     */
-    GenericParamList getGenericParamList() { enum_generic_param_lists(this, result) }
-
-    /**
-     * Gets the name of this enum, if it exists.
-     */
-    Name getName() { enum_names(this, result) }
-
     /**
      * Gets the variant list of this enum, if it exists.
      */
     VariantList getVariantList() { enum_variant_lists(this, result) }
-
-    /**
-     * Gets the visibility of this enum, if it exists.
-     */
-    Visibility getVisibility() { enum_visibilities(this, result) }
-
-    /**
-     * Gets the where clause of this enum, if it exists.
-     */
-    WhereClause getWhereClause() { enum_where_clauses(this, result) }
   }
 
   private Element getImmediateChildOfEnum(Enum e, int index) {
     exists(
       int n, int nAttributeMacroExpansion, int nDeriveMacroExpansion, int nAttr,
-      int nGenericParamList, int nName, int nVariantList, int nVisibility, int nWhereClause
+      int nGenericParamList, int nName, int nVisibility, int nWhereClause, int nVariantList
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
@@ -7042,9 +7042,9 @@ module Raw {
       nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
-      nVariantList = nName + 1 and
-      nVisibility = nVariantList + 1 and
+      nVisibility = nName + 1 and
       nWhereClause = nVisibility + 1 and
+      nVariantList = nWhereClause + 1 and
       (
         none()
         or
@@ -7058,11 +7058,11 @@ module Raw {
         or
         index = nGenericParamList and result = e.getName()
         or
-        index = nName and result = e.getVariantList()
-        or
-        index = nVariantList and result = e.getVisibility()
+        index = nName and result = e.getVisibility()
         or
         index = nVisibility and result = e.getWhereClause()
+        or
+        index = nWhereClause and result = e.getVariantList()
       )
     )
   }
@@ -7473,59 +7473,29 @@ module Raw {
    * }
    * ```
    */
-  class Struct extends @struct, Adt {
+  class Struct extends @struct, TypeItem {
     override string toString() { result = "Struct" }
 
-    /**
-     * Gets the `index`th attr of this struct (0-based).
-     */
-    Attr getAttr(int index) { struct_attrs(this, index, result) }
-
-    /**
-     * Gets the number of attrs of this struct.
-     */
-    int getNumberOfAttrs() { result = count(int i | struct_attrs(this, i, _)) }
-
     /**
      * Gets the field list of this struct, if it exists.
      */
     FieldList getFieldList() { struct_field_lists_(this, result) }
-
-    /**
-     * Gets the generic parameter list of this struct, if it exists.
-     */
-    GenericParamList getGenericParamList() { struct_generic_param_lists(this, result) }
-
-    /**
-     * Gets the name of this struct, if it exists.
-     */
-    Name getName() { struct_names(this, result) }
-
-    /**
-     * Gets the visibility of this struct, if it exists.
-     */
-    Visibility getVisibility() { struct_visibilities(this, result) }
-
-    /**
-     * Gets the where clause of this struct, if it exists.
-     */
-    WhereClause getWhereClause() { struct_where_clauses(this, result) }
   }
 
   private Element getImmediateChildOfStruct(Struct e, int index) {
     exists(
-      int n, int nAttributeMacroExpansion, int nDeriveMacroExpansion, int nAttr, int nFieldList,
-      int nGenericParamList, int nName, int nVisibility, int nWhereClause
+      int n, int nAttributeMacroExpansion, int nDeriveMacroExpansion, int nAttr,
+      int nGenericParamList, int nName, int nVisibility, int nWhereClause, int nFieldList
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
       nDeriveMacroExpansion = nAttributeMacroExpansion + e.getNumberOfDeriveMacroExpansions() and
       nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
-      nFieldList = nAttr + 1 and
-      nGenericParamList = nFieldList + 1 and
+      nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
       nVisibility = nName + 1 and
       nWhereClause = nVisibility + 1 and
+      nFieldList = nWhereClause + 1 and
       (
         none()
         or
@@ -7535,15 +7505,15 @@ module Raw {
         or
         result = e.getAttr(index - nDeriveMacroExpansion)
         or
-        index = nAttr and result = e.getFieldList()
-        or
-        index = nFieldList and result = e.getGenericParamList()
+        index = nAttr and result = e.getGenericParamList()
         or
         index = nGenericParamList and result = e.getName()
         or
         index = nName and result = e.getVisibility()
         or
         index = nVisibility and result = e.getWhereClause()
+        or
+        index = nWhereClause and result = e.getFieldList()
       )
     )
   }
@@ -7654,49 +7624,19 @@ module Raw {
    * union U { f1: u32, f2: f32 }
    * ```
    */
-  class Union extends @union, Adt {
+  class Union extends @union, TypeItem {
     override string toString() { result = "Union" }
 
-    /**
-     * Gets the `index`th attr of this union (0-based).
-     */
-    Attr getAttr(int index) { union_attrs(this, index, result) }
-
-    /**
-     * Gets the number of attrs of this union.
-     */
-    int getNumberOfAttrs() { result = count(int i | union_attrs(this, i, _)) }
-
-    /**
-     * Gets the generic parameter list of this union, if it exists.
-     */
-    GenericParamList getGenericParamList() { union_generic_param_lists(this, result) }
-
-    /**
-     * Gets the name of this union, if it exists.
-     */
-    Name getName() { union_names(this, result) }
-
     /**
      * Gets the struct field list of this union, if it exists.
      */
     StructFieldList getStructFieldList() { union_struct_field_lists(this, result) }
-
-    /**
-     * Gets the visibility of this union, if it exists.
-     */
-    Visibility getVisibility() { union_visibilities(this, result) }
-
-    /**
-     * Gets the where clause of this union, if it exists.
-     */
-    WhereClause getWhereClause() { union_where_clauses(this, result) }
   }
 
   private Element getImmediateChildOfUnion(Union e, int index) {
     exists(
       int n, int nAttributeMacroExpansion, int nDeriveMacroExpansion, int nAttr,
-      int nGenericParamList, int nName, int nStructFieldList, int nVisibility, int nWhereClause
+      int nGenericParamList, int nName, int nVisibility, int nWhereClause, int nStructFieldList
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
@@ -7704,9 +7644,9 @@ module Raw {
       nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
-      nStructFieldList = nName + 1 and
-      nVisibility = nStructFieldList + 1 and
+      nVisibility = nName + 1 and
       nWhereClause = nVisibility + 1 and
+      nStructFieldList = nWhereClause + 1 and
       (
         none()
         or
@@ -7720,11 +7660,11 @@ module Raw {
         or
         index = nGenericParamList and result = e.getName()
         or
-        index = nName and result = e.getStructFieldList()
-        or
-        index = nStructFieldList and result = e.getVisibility()
+        index = nName and result = e.getVisibility()
         or
         index = nVisibility and result = e.getWhereClause()
+        or
+        index = nWhereClause and result = e.getStructFieldList()
       )
     )
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
index 8910d2691695..07c4657c651f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
@@ -6,13 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.AdtImpl::Impl as AdtImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.FieldList
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.Name
-import codeql.rust.elements.Visibility
-import codeql.rust.elements.WhereClause
+import codeql.rust.elements.internal.TypeItemImpl::Impl as TypeItemImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Struct` and should not
@@ -30,27 +25,9 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Struct` class directly.
    * Use the subclass `Struct`, where the following predicates are available.
    */
-  class Struct extends Synth::TStruct, AdtImpl::Adt {
+  class Struct extends Synth::TStruct, TypeItemImpl::TypeItem {
     override string getAPrimaryQlClass() { result = "Struct" }
 
-    /**
-     * Gets the `index`th attr of this struct (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertStructToRaw(this).(Raw::Struct).getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this struct.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this struct.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
     /**
      * Gets the field list of this struct, if it exists.
      */
@@ -63,62 +40,5 @@ module Generated {
      * Holds if `getFieldList()` exists.
      */
     final predicate hasFieldList() { exists(this.getFieldList()) }
-
-    /**
-     * Gets the generic parameter list of this struct, if it exists.
-     */
-    GenericParamList getGenericParamList() {
-      result =
-        Synth::convertGenericParamListFromRaw(Synth::convertStructToRaw(this)
-              .(Raw::Struct)
-              .getGenericParamList())
-    }
-
-    /**
-     * Holds if `getGenericParamList()` exists.
-     */
-    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
-
-    /**
-     * Gets the name of this struct, if it exists.
-     */
-    Name getName() {
-      result = Synth::convertNameFromRaw(Synth::convertStructToRaw(this).(Raw::Struct).getName())
-    }
-
-    /**
-     * Holds if `getName()` exists.
-     */
-    final predicate hasName() { exists(this.getName()) }
-
-    /**
-     * Gets the visibility of this struct, if it exists.
-     */
-    Visibility getVisibility() {
-      result =
-        Synth::convertVisibilityFromRaw(Synth::convertStructToRaw(this)
-              .(Raw::Struct)
-              .getVisibility())
-    }
-
-    /**
-     * Holds if `getVisibility()` exists.
-     */
-    final predicate hasVisibility() { exists(this.getVisibility()) }
-
-    /**
-     * Gets the where clause of this struct, if it exists.
-     */
-    WhereClause getWhereClause() {
-      result =
-        Synth::convertWhereClauseFromRaw(Synth::convertStructToRaw(this)
-              .(Raw::Struct)
-              .getWhereClause())
-    }
-
-    /**
-     * Holds if `getWhereClause()` exists.
-     */
-    final predicate hasWhereClause() { exists(this.getWhereClause()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
index b5fc41677b23..8b22dbbac9dc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -688,11 +688,6 @@ module Synth {
    */
   class TAddressable = TItem or TVariant;
 
-  /**
-   * INTERNAL: Do not use.
-   */
-  class TAdt = TEnum or TStruct or TUnion;
-
   /**
    * INTERNAL: Do not use.
    */
@@ -769,8 +764,8 @@ module Synth {
    * INTERNAL: Do not use.
    */
   class TItem =
-    TAdt or TAsmExpr or TAssocItem or TExternBlock or TExternCrate or TExternItem or TImpl or
-        TMacroDef or TMacroRules or TModule or TTrait or TTraitAlias or TUse;
+    TAsmExpr or TAssocItem or TExternBlock or TExternCrate or TExternItem or TImpl or TMacroDef or
+        TMacroRules or TModule or TTrait or TTraitAlias or TTypeItem or TUse;
 
   /**
    * INTERNAL: Do not use.
@@ -820,6 +815,11 @@ module Synth {
    */
   class TToken = TComment;
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TTypeItem = TEnum or TStruct or TUnion;
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2032,18 +2032,6 @@ module Synth {
     result = convertVariantFromRaw(e)
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TAdt`, if possible.
-   */
-  TAdt convertAdtFromRaw(Raw::Element e) {
-    result = convertEnumFromRaw(e)
-    or
-    result = convertStructFromRaw(e)
-    or
-    result = convertUnionFromRaw(e)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TArrayExpr`, if possible.
@@ -2379,8 +2367,6 @@ module Synth {
    * Converts a raw DB element to a synthesized `TItem`, if possible.
    */
   TItem convertItemFromRaw(Raw::Element e) {
-    result = convertAdtFromRaw(e)
-    or
     result = convertAsmExprFromRaw(e)
     or
     result = convertAssocItemFromRaw(e)
@@ -2403,6 +2389,8 @@ module Synth {
     or
     result = convertTraitAliasFromRaw(e)
     or
+    result = convertTypeItemFromRaw(e)
+    or
     result = convertUseFromRaw(e)
   }
 
@@ -2534,6 +2522,18 @@ module Synth {
    */
   TToken convertTokenFromRaw(Raw::Element e) { result = convertCommentFromRaw(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TTypeItem`, if possible.
+   */
+  TTypeItem convertTypeItemFromRaw(Raw::Element e) {
+    result = convertEnumFromRaw(e)
+    or
+    result = convertStructFromRaw(e)
+    or
+    result = convertUnionFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TTypeRepr`, if possible.
@@ -3600,18 +3600,6 @@ module Synth {
     result = convertVariantToRaw(e)
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TAdt` to a raw DB element, if possible.
-   */
-  Raw::Element convertAdtToRaw(TAdt e) {
-    result = convertEnumToRaw(e)
-    or
-    result = convertStructToRaw(e)
-    or
-    result = convertUnionToRaw(e)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TArrayExpr` to a raw DB element, if possible.
@@ -3947,8 +3935,6 @@ module Synth {
    * Converts a synthesized `TItem` to a raw DB element, if possible.
    */
   Raw::Element convertItemToRaw(TItem e) {
-    result = convertAdtToRaw(e)
-    or
     result = convertAsmExprToRaw(e)
     or
     result = convertAssocItemToRaw(e)
@@ -3971,6 +3957,8 @@ module Synth {
     or
     result = convertTraitAliasToRaw(e)
     or
+    result = convertTypeItemToRaw(e)
+    or
     result = convertUseToRaw(e)
   }
 
@@ -4102,6 +4090,18 @@ module Synth {
    */
   Raw::Element convertTokenToRaw(TToken e) { result = convertCommentToRaw(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TTypeItem` to a raw DB element, if possible.
+   */
+  Raw::Element convertTypeItemToRaw(TTypeItem e) {
+    result = convertEnumToRaw(e)
+    or
+    result = convertStructToRaw(e)
+    or
+    result = convertUnionToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TTypeRepr` to a raw DB element, if possible.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeItem.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeItem.qll
new file mode 100644
index 000000000000..5bc8bfb3c775
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeItem.qll
@@ -0,0 +1,126 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TypeItem`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.MacroItems
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TypeItem` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * An item that defines a type. Either a `Struct`, `Enum`, or `Union`.
+   * INTERNAL: Do not reference the `Generated::TypeItem` class directly.
+   * Use the subclass `TypeItem`, where the following predicates are available.
+   */
+  class TypeItem extends Synth::TTypeItem, ItemImpl::Item {
+    /**
+     * Gets the `index`th derive macro expansion of this type item (0-based).
+     */
+    MacroItems getDeriveMacroExpansion(int index) {
+      result =
+        Synth::convertMacroItemsFromRaw(Synth::convertTypeItemToRaw(this)
+              .(Raw::TypeItem)
+              .getDeriveMacroExpansion(index))
+    }
+
+    /**
+     * Gets any of the derive macro expansions of this type item.
+     */
+    final MacroItems getADeriveMacroExpansion() { result = this.getDeriveMacroExpansion(_) }
+
+    /**
+     * Gets the number of derive macro expansions of this type item.
+     */
+    final int getNumberOfDeriveMacroExpansions() {
+      result = count(int i | exists(this.getDeriveMacroExpansion(i)))
+    }
+
+    /**
+     * Gets the `index`th attr of this type item (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertTypeItemToRaw(this).(Raw::TypeItem).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this type item.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this type item.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the generic parameter list of this type item, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertTypeItemToRaw(this)
+              .(Raw::TypeItem)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the name of this type item, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertTypeItemToRaw(this).(Raw::TypeItem).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the visibility of this type item, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertTypeItemToRaw(this)
+              .(Raw::TypeItem)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this type item, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertTypeItemToRaw(this)
+              .(Raw::TypeItem)
+              .getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll
index e42eed69263b..5d31edafa114 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll
@@ -6,13 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.AdtImpl::Impl as AdtImpl
-import codeql.rust.elements.Attr
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.Name
 import codeql.rust.elements.StructFieldList
-import codeql.rust.elements.Visibility
-import codeql.rust.elements.WhereClause
+import codeql.rust.elements.internal.TypeItemImpl::Impl as TypeItemImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Union` and should not
@@ -29,53 +24,9 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Union` class directly.
    * Use the subclass `Union`, where the following predicates are available.
    */
-  class Union extends Synth::TUnion, AdtImpl::Adt {
+  class Union extends Synth::TUnion, TypeItemImpl::TypeItem {
     override string getAPrimaryQlClass() { result = "Union" }
 
-    /**
-     * Gets the `index`th attr of this union (0-based).
-     */
-    Attr getAttr(int index) {
-      result = Synth::convertAttrFromRaw(Synth::convertUnionToRaw(this).(Raw::Union).getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this union.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this union.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
-    /**
-     * Gets the generic parameter list of this union, if it exists.
-     */
-    GenericParamList getGenericParamList() {
-      result =
-        Synth::convertGenericParamListFromRaw(Synth::convertUnionToRaw(this)
-              .(Raw::Union)
-              .getGenericParamList())
-    }
-
-    /**
-     * Holds if `getGenericParamList()` exists.
-     */
-    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
-
-    /**
-     * Gets the name of this union, if it exists.
-     */
-    Name getName() {
-      result = Synth::convertNameFromRaw(Synth::convertUnionToRaw(this).(Raw::Union).getName())
-    }
-
-    /**
-     * Holds if `getName()` exists.
-     */
-    final predicate hasName() { exists(this.getName()) }
-
     /**
      * Gets the struct field list of this union, if it exists.
      */
@@ -90,33 +41,5 @@ module Generated {
      * Holds if `getStructFieldList()` exists.
      */
     final predicate hasStructFieldList() { exists(this.getStructFieldList()) }
-
-    /**
-     * Gets the visibility of this union, if it exists.
-     */
-    Visibility getVisibility() {
-      result =
-        Synth::convertVisibilityFromRaw(Synth::convertUnionToRaw(this).(Raw::Union).getVisibility())
-    }
-
-    /**
-     * Holds if `getVisibility()` exists.
-     */
-    final predicate hasVisibility() { exists(this.getVisibility()) }
-
-    /**
-     * Gets the where clause of this union, if it exists.
-     */
-    WhereClause getWhereClause() {
-      result =
-        Synth::convertWhereClauseFromRaw(Synth::convertUnionToRaw(this)
-              .(Raw::Union)
-              .getWhereClause())
-    }
-
-    /**
-     * Holds if `getWhereClause()` exists.
-     */
-    final predicate hasWhereClause() { exists(this.getWhereClause()) }
   }
 }
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index e54d01f67a41..c467bf639160 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -1876,8 +1876,7 @@ infer_type_reprs(
 );
 
 @item =
-  @adt
-| @asm_expr
+  @asm_expr
 | @assoc_item
 | @extern_block
 | @extern_crate
@@ -1888,6 +1887,7 @@ infer_type_reprs(
 | @module
 | @trait
 | @trait_alias
+| @type_item
 | @use
 ;
 
@@ -2725,19 +2725,6 @@ yield_expr_exprs(
   int expr: @expr ref
 );
 
-@adt =
-  @enum
-| @struct
-| @union
-;
-
-#keyset[id, index]
-adt_derive_macro_expansions(
-  int id: @adt ref,
-  int index: int ref,
-  int derive_macro_expansion: @macro_items ref
-);
-
 asm_exprs(
   unique int id: @asm_expr
 );
@@ -3157,6 +3144,50 @@ trait_alias_where_clauses(
   int where_clause: @where_clause ref
 );
 
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
 uses(
   unique int id: @use
 );
@@ -3246,43 +3277,12 @@ enums(
   unique int id: @enum
 );
 
-#keyset[id, index]
-enum_attrs(
-  int id: @enum ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id]
-enum_generic_param_lists(
-  int id: @enum ref,
-  int generic_param_list: @generic_param_list ref
-);
-
-#keyset[id]
-enum_names(
-  int id: @enum ref,
-  int name: @name ref
-);
-
 #keyset[id]
 enum_variant_lists(
   int id: @enum ref,
   int variant_list: @variant_list ref
 );
 
-#keyset[id]
-enum_visibilities(
-  int id: @enum ref,
-  int visibility: @visibility ref
-);
-
-#keyset[id]
-enum_where_clauses(
-  int id: @enum ref,
-  int where_clause: @where_clause ref
-);
-
 for_exprs(
   unique int id: @for_expr
 );
@@ -3476,43 +3476,12 @@ structs(
   unique int id: @struct
 );
 
-#keyset[id, index]
-struct_attrs(
-  int id: @struct ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
 #keyset[id]
 struct_field_lists_(
   int id: @struct ref,
   int field_list: @field_list ref
 );
 
-#keyset[id]
-struct_generic_param_lists(
-  int id: @struct ref,
-  int generic_param_list: @generic_param_list ref
-);
-
-#keyset[id]
-struct_names(
-  int id: @struct ref,
-  int name: @name ref
-);
-
-#keyset[id]
-struct_visibilities(
-  int id: @struct ref,
-  int visibility: @visibility ref
-);
-
-#keyset[id]
-struct_where_clauses(
-  int id: @struct ref,
-  int where_clause: @where_clause ref
-);
-
 type_aliases(
   unique int id: @type_alias
 );
@@ -3569,43 +3538,12 @@ unions(
   unique int id: @union
 );
 
-#keyset[id, index]
-union_attrs(
-  int id: @union ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id]
-union_generic_param_lists(
-  int id: @union ref,
-  int generic_param_list: @generic_param_list ref
-);
-
-#keyset[id]
-union_names(
-  int id: @union ref,
-  int name: @name ref
-);
-
 #keyset[id]
 union_struct_field_lists(
   int id: @union ref,
   int struct_field_list: @struct_field_list ref
 );
 
-#keyset[id]
-union_visibilities(
-  int id: @union ref,
-  int visibility: @visibility ref
-);
-
-#keyset[id]
-union_where_clauses(
-  int id: @union ref,
-  int where_clause: @where_clause ref
-);
-
 while_exprs(
   unique int id: @while_expr
 );
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
index 0aa1bda8041e..d9843feecc36 100644
--- a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
@@ -26,10 +26,6 @@ query predicate getName(Enum x, Name getName) {
   toBeTested(x) and not x.isUnknown() and getName = x.getName()
 }
 
-query predicate getVariantList(Enum x, VariantList getVariantList) {
-  toBeTested(x) and not x.isUnknown() and getVariantList = x.getVariantList()
-}
-
 query predicate getVisibility(Enum x, Visibility getVisibility) {
   toBeTested(x) and not x.isUnknown() and getVisibility = x.getVisibility()
 }
@@ -37,3 +33,7 @@ query predicate getVisibility(Enum x, Visibility getVisibility) {
 query predicate getWhereClause(Enum x, WhereClause getWhereClause) {
   toBeTested(x) and not x.isUnknown() and getWhereClause = x.getWhereClause()
 }
+
+query predicate getVariantList(Enum x, VariantList getVariantList) {
+  toBeTested(x) and not x.isUnknown() and getVariantList = x.getVariantList()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
index 25a980701c57..a4cf01bbfdc7 100644
--- a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
@@ -18,10 +18,6 @@ query predicate getAttr(Struct x, int index, Attr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
 
-query predicate getFieldList(Struct x, FieldList getFieldList) {
-  toBeTested(x) and not x.isUnknown() and getFieldList = x.getFieldList()
-}
-
 query predicate getGenericParamList(Struct x, GenericParamList getGenericParamList) {
   toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
 }
@@ -37,3 +33,7 @@ query predicate getVisibility(Struct x, Visibility getVisibility) {
 query predicate getWhereClause(Struct x, WhereClause getWhereClause) {
   toBeTested(x) and not x.isUnknown() and getWhereClause = x.getWhereClause()
 }
+
+query predicate getFieldList(Struct x, FieldList getFieldList) {
+  toBeTested(x) and not x.isUnknown() and getFieldList = x.getFieldList()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.ql b/rust/ql/test/extractor-tests/generated/Union/Union.ql
index 9c555d1e5906..922e8ef4a591 100644
--- a/rust/ql/test/extractor-tests/generated/Union/Union.ql
+++ b/rust/ql/test/extractor-tests/generated/Union/Union.ql
@@ -26,10 +26,6 @@ query predicate getName(Union x, Name getName) {
   toBeTested(x) and not x.isUnknown() and getName = x.getName()
 }
 
-query predicate getStructFieldList(Union x, StructFieldList getStructFieldList) {
-  toBeTested(x) and not x.isUnknown() and getStructFieldList = x.getStructFieldList()
-}
-
 query predicate getVisibility(Union x, Visibility getVisibility) {
   toBeTested(x) and not x.isUnknown() and getVisibility = x.getVisibility()
 }
@@ -37,3 +33,7 @@ query predicate getVisibility(Union x, Visibility getVisibility) {
 query predicate getWhereClause(Union x, WhereClause getWhereClause) {
   toBeTested(x) and not x.isUnknown() and getWhereClause = x.getWhereClause()
 }
+
+query predicate getStructFieldList(Union x, StructFieldList getStructFieldList) {
+  toBeTested(x) and not x.isUnknown() and getStructFieldList = x.getStructFieldList()
+}

From b64809cbd3a5e18d83a7bbf283ed6574daf29cf3 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Wed, 17 Dec 2025 11:12:16 +0100
Subject: [PATCH 4/8] Rust: Adapt QL to AST changes

---
 rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll | 2 +-
 rust/ql/lib/codeql/rust/internal/PathResolution.qll       | 6 +++---
 rust/ql/test/extractor-tests/macro-expansion/test.ql      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
index 158a5ee96707..df586df6424d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
@@ -46,7 +46,7 @@ module Impl {
     private predicate isMacroExpansion(AstNode macro, AstNode expansion) {
       expansion = macro.(MacroCall).getMacroCallExpansion()
       or
-      expansion = macro.(Adt).getDeriveMacroExpansion(_)
+      expansion = macro.(TypeItem).getDeriveMacroExpansion(_)
       or
       expansion = macro.(Item).getAttributeMacroExpansion()
     }
diff --git a/rust/ql/lib/codeql/rust/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
index 28a72d370ae9..c969e62a357a 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolution.qll
+++ b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
@@ -1796,9 +1796,9 @@ private module DollarCrateResolution {
       macroDefPath = mc.getPath()
     )
     or
-    exists(ItemNode adt |
-      expansion = adt.(Adt).getDeriveMacroExpansion(_) and
-      macroDefPath = adt.getAttr("derive").getMeta().getPath()
+    exists(ItemNode type |
+      expansion = type.(TypeItem).getDeriveMacroExpansion(_) and
+      macroDefPath = type.getAttr("derive").getMeta().getPath()
     )
   }
 
diff --git a/rust/ql/test/extractor-tests/macro-expansion/test.ql b/rust/ql/test/extractor-tests/macro-expansion/test.ql
index 7d97ea6a10f0..6372dc2e93fa 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/test.ql
+++ b/rust/ql/test/extractor-tests/macro-expansion/test.ql
@@ -5,7 +5,7 @@ query predicate attribute_macros(Item i, int index, Item expanded) {
   i.fromSource() and expanded = i.getAttributeMacroExpansion().getItem(index)
 }
 
-query predicate derive_macros(Adt i, int index, int subIndex, Item expanded) {
+query predicate derive_macros(TypeItem i, int index, int subIndex, Item expanded) {
   i.fromSource() and expanded = i.getDeriveMacroExpansion(index).getItem(subIndex)
 }
 

From f1364caaa9ce1d9cc28f06b095bf2d2663247f7b Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Wed, 17 Dec 2025 12:15:16 +0100
Subject: [PATCH 5/8] Rust: Add upgrade and downgrade scripts

---
 .../downgrade.ql                              |   73 +
 .../old.dbscheme                              | 3562 ++++++++++++++++
 .../rust.dbscheme                             | 3624 +++++++++++++++++
 .../upgrade.properties                        |   29 +
 .../upgrade.properties                        |    4 +-
 .../old.dbscheme                              | 3624 +++++++++++++++++
 .../rust.dbscheme                             | 3562 ++++++++++++++++
 .../upgrade.properties                        |   29 +
 .../upgrade.ql                                |   45 +
 9 files changed, 14550 insertions(+), 2 deletions(-)
 create mode 100644 rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/downgrade.ql
 create mode 100644 rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/old.dbscheme
 create mode 100644 rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/rust.dbscheme
 create mode 100644 rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/upgrade.properties
 create mode 100644 rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/old.dbscheme
 create mode 100644 rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/rust.dbscheme
 create mode 100644 rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties
 create mode 100644 rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.ql

diff --git a/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/downgrade.ql b/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/downgrade.ql
new file mode 100644
index 000000000000..6df51a29ffee
--- /dev/null
+++ b/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/downgrade.ql
@@ -0,0 +1,73 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Enum extends Element, @enum { }
+
+class Struct extends Element, @struct { }
+
+class Union extends Element, @union { }
+
+class Attr extends Element, @attr { }
+
+class GenericParamList extends Element, @generic_param_list { }
+
+class Name extends Element, @name { }
+
+class Visibility extends Element, @visibility { }
+
+class WhereClause extends Element, @where_clause { }
+
+query predicate new_enum_attrs(Enum enum, int index, Attr attr) {
+  type_item_attrs(enum, index, attr)
+}
+
+query predicate new_enum_generic_param_lists(Enum enum, GenericParamList g) {
+  type_item_generic_param_lists(enum, g)
+}
+
+query predicate new_enum_names(Enum enum, Name name) { type_item_names(enum, name) }
+
+query predicate new_enum_visibilities(Enum enum, Visibility visibility) {
+  type_item_visibilities(enum, visibility)
+}
+
+query predicate new_enum_where_clauses(Enum enum, WhereClause whereClause) {
+  type_item_where_clauses(enum, whereClause)
+}
+
+query predicate new_struct_attrs(Struct struct, int index, Attr attr) {
+  type_item_attrs(struct, index, attr)
+}
+
+query predicate new_struct_generic_param_lists(Struct struct, GenericParamList g) {
+  type_item_generic_param_lists(struct, g)
+}
+
+query predicate new_struct_names(Struct struct, Name name) { type_item_names(struct, name) }
+
+query predicate new_struct_visibilities(Struct struct, Visibility visibility) {
+  type_item_visibilities(struct, visibility)
+}
+
+query predicate new_struct_where_clauses(Struct struct, WhereClause whereClause) {
+  type_item_where_clauses(struct, whereClause)
+}
+
+query predicate new_union_attrs(Union union, int index, Attr attr) {
+  type_item_attrs(union, index, attr)
+}
+
+query predicate new_union_generic_param_lists(Union union, GenericParamList g) {
+  type_item_generic_param_lists(union, g)
+}
+
+query predicate new_union_names(Union union, Name name) { type_item_names(union, name) }
+
+query predicate new_union_visibilities(Union union, Visibility visibility) {
+  type_item_visibilities(union, visibility)
+}
+
+query predicate new_union_where_clauses(Union union, WhereClause whereClause) {
+  type_item_where_clauses(union, whereClause)
+}
diff --git a/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/old.dbscheme b/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/old.dbscheme
new file mode 100644
index 000000000000..c467bf639160
--- /dev/null
+++ b/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/old.dbscheme
@@ -0,0 +1,3562 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/rust.dbscheme b/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/rust.dbscheme
new file mode 100644
index 000000000000..e54d01f67a41
--- /dev/null
+++ b/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/rust.dbscheme
@@ -0,0 +1,3624 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/upgrade.properties b/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/upgrade.properties
new file mode 100644
index 000000000000..e73d8c313cc7
--- /dev/null
+++ b/rust/downgrades/c467bf63916002287b7bde8ce8b094c57579bd81/upgrade.properties
@@ -0,0 +1,29 @@
+description: Renamed the `@type_item` union type to `@adt` and updated its relations
+compatibility: full
+
+type_item_derive_macro_expansions.rel: delete
+type_item_attrs.rel: delete
+type_item_generic_param_lists.rel: delete
+type_item_names.rel: delete
+type_item_visibilities.rel: delete
+type_item_where_clauses.rel: delete
+
+adt_derive_macro_expansions.rel: reorder type_item_derive_macro_expansions.rel (@type_item id, int index, @macro_items items) id index items
+
+enum_attrs.rel: run downgrade.ql new_enum_attrs
+enum_generic_param_lists.rel: run downgrade.ql new_enum_generic_param_lists
+enum_names.rel: run downgrade.ql new_enum_names
+enum_visibilities.rel: run downgrade.ql new_enum_visibilities
+enum_where_clauses.rel: run downgrade.ql new_enum_where_clauses
+
+struct_attrs.rel: run downgrade.ql new_struct_attrs
+struct_generic_param_lists.rel: run downgrade.ql new_struct_generic_param_lists
+struct_names.rel: run downgrade.ql new_struct_names
+struct_visibilities.rel: run downgrade.ql new_struct_visibilities
+struct_where_clauses.rel: run downgrade.ql new_struct_where_clauses
+
+union_attrs.rel: run downgrade.ql new_union_attrs
+union_generic_param_lists.rel: run downgrade.ql new_union_generic_param_lists
+union_names.rel: run downgrade.ql new_union_names
+union_visibilities.rel: run downgrade.ql new_union_visibilities
+union_where_clauses.rel: run downgrade.ql new_union_where_clauses
\ No newline at end of file
diff --git a/rust/downgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties b/rust/downgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties
index d753a48ad740..bb950e335a96 100644
--- a/rust/downgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties
+++ b/rust/downgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties
@@ -1,5 +1,5 @@
-description: Added the `@call_expr_base` union type
-compatibility: backwards
+description: Added the `@type_item` union type
+compatibility: full
 
 call_expr_arg_lists.rel: delete
 call_expr_attrs.rel: delete
diff --git a/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/old.dbscheme b/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/old.dbscheme
new file mode 100644
index 000000000000..e54d01f67a41
--- /dev/null
+++ b/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/old.dbscheme
@@ -0,0 +1,3624 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/rust.dbscheme b/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/rust.dbscheme
new file mode 100644
index 000000000000..c467bf639160
--- /dev/null
+++ b/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/rust.dbscheme
@@ -0,0 +1,3562 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @method_call_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_arg_lists(
+  int id: @call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_attrs(
+  int id: @call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @type_item
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_arg_lists(
+  int id: @method_call_expr ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+method_call_expr_attrs(
+  int id: @method_call_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+@type_item =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+type_item_derive_macro_expansions(
+  int id: @type_item ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+#keyset[id, index]
+type_item_attrs(
+  int id: @type_item ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_item_generic_param_lists(
+  int id: @type_item ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_item_names(
+  int id: @type_item ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_item_visibilities(
+  int id: @type_item ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_item_where_clauses(
+  int id: @type_item ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties b/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties
new file mode 100644
index 000000000000..2377b8d6e239
--- /dev/null
+++ b/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties
@@ -0,0 +1,29 @@
+description: Renamed the `@adt` union type to `@type_item` and updated its relations
+compatibility: full
+
+adt_derive_macro_expansions.rel: delete
+
+enum_attrs.rel: delete
+enum_generic_param_lists.rel: delete
+enum_names.rel: delete
+enum_visibilities.rel: delete
+enum_where_clauses.rel: delete
+
+struct_attrs.rel: delete
+struct_generic_param_lists.rel: delete
+struct_names.rel: delete
+struct_visibilities.rel: delete
+struct_where_clauses.rel: delete
+
+union_attrs.rel: delete
+union_generic_param_lists.rel: delete
+union_names.rel: delete
+union_visibilities.rel: delete
+union_where_clauses.rel: delete
+
+type_item_derive_macro_expansions.rel: reorder adt_derive_macro_expansions.rel (@adt id, int index, @macro_items items) id index items
+type_item_attrs.rel: run upgrade.ql new_type_item_attrs
+type_item_generic_param_lists.rel: run upgrade.ql new_type_item_generic_param_lists
+type_item_names.rel: run upgrade.ql new_type_item_names
+type_item_visibilities.rel: run upgrade.ql new_type_item_visibilities
+type_item_where_clauses.rel: run upgrade.ql new_type_item_where_clauses
\ No newline at end of file
diff --git a/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.ql b/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.ql
new file mode 100644
index 000000000000..c8e8e956fd80
--- /dev/null
+++ b/rust/ql/lib/upgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.ql
@@ -0,0 +1,45 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Adt extends Element, @adt { }
+
+class Attr extends Element, @attr { }
+
+class GenericParamList extends Element, @generic_param_list { }
+
+class Name extends Element, @name { }
+
+class Visibility extends Element, @visibility { }
+
+class WhereClause extends Element, @where_clause { }
+
+query predicate new_type_item_attrs(Adt adt, int index, Attr attr) {
+  enum_attrs(adt, index, attr) or
+  struct_attrs(adt, index, attr) or
+  union_attrs(adt, index, attr)
+}
+
+query predicate new_type_item_generic_param_lists(Adt adt, GenericParamList g) {
+  enum_generic_param_lists(adt, g) or
+  struct_generic_param_lists(adt, g) or
+  union_generic_param_lists(adt, g)
+}
+
+query predicate new_type_item_names(Adt adt, Name name) {
+  enum_names(adt, name) or
+  struct_names(adt, name) or
+  union_names(adt, name)
+}
+
+query predicate new_type_item_visibilities(Adt adt, Visibility visibility) {
+  enum_visibilities(adt, visibility) or
+  struct_visibilities(adt, visibility) or
+  union_visibilities(adt, visibility)
+}
+
+query predicate new_type_item_where_clauses(Adt adt, WhereClause where_clause) {
+  enum_where_clauses(adt, where_clause) or
+  struct_where_clauses(adt, where_clause) or
+  union_where_clauses(adt, where_clause)
+}

From 97fd70e4f4cd4093fb0b54df069bf7cce29fccfe Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Wed, 17 Dec 2025 13:56:48 +0100
Subject: [PATCH 6/8] Rust: Accept change to expected file

---
 .../ql/test/extractor-tests/macro-expansion/PrintAst.expected | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected b/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
index e50dc4d5274e..5d43ff532fd3 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
+++ b/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
@@ -699,6 +699,7 @@ macro_expansion.rs:
 #   76|             getSegment(): [PathSegment] i32
 #   76|               getIdentifier(): [NameRef] i32
 #   78|   getItem(16): [Struct] struct MyStruct
+#   78|     getName(): [Name] MyStruct
 #   78|     getFieldList(): [StructFieldList] StructFieldList
 #   79|       getField(0): [StructField] field: ...
 #   79|         getName(): [Name] field
@@ -712,7 +713,6 @@ macro_expansion.rs:
 #   79|               getPath(): [Path] i32
 #   79|                 getSegment(): [PathSegment] i32
 #   79|                   getIdentifier(): [NameRef] i32
-#   78|     getName(): [Name] MyStruct
 #   83|   getItem(17): [Struct] struct MyDerive
 #   84|     getDeriveMacroExpansion(0): [MacroItems] MacroItems
 #   84|       getItem(0): [Impl] impl ...::Debug for MyDerive::<...> { ... }
@@ -808,6 +808,7 @@ macro_expansion.rs:
 #   83|           getSegment(): [PathSegment] derive
 #   83|             getIdentifier(): [NameRef] derive
 #   83|         getTokenTree(): [TokenTree] TokenTree
+#   84|     getName(): [Name] MyDerive
 #   84|     getFieldList(): [StructFieldList] StructFieldList
 #   85|       getField(0): [StructField] field: usize
 #   85|         getName(): [Name] field
@@ -815,7 +816,6 @@ macro_expansion.rs:
 #   85|           getPath(): [Path] usize
 #   85|             getSegment(): [PathSegment] usize
 #   85|               getIdentifier(): [NameRef] usize
-#   84|     getName(): [Name] MyDerive
 #   88|   getItem(18): [Enum] enum MyDeriveEnum
 #   89|     getDeriveMacroExpansion(0): [MacroItems] MacroItems
 #   89|       getItem(0): [Impl] impl ...::PartialEq for MyDeriveEnum::<...> { ... }

From 8564c1f4582750b0b89a7e48ffa7722c913201b4 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Wed, 17 Dec 2025 14:50:50 +0100
Subject: [PATCH 7/8] Rust: Add change note

---
 rust/ql/lib/change-notes/2025-12-17-adt-rename.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 rust/ql/lib/change-notes/2025-12-17-adt-rename.md

diff --git a/rust/ql/lib/change-notes/2025-12-17-adt-rename.md b/rust/ql/lib/change-notes/2025-12-17-adt-rename.md
new file mode 100644
index 000000000000..0b66b4664a15
--- /dev/null
+++ b/rust/ql/lib/change-notes/2025-12-17-adt-rename.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Renamed the `Adt` class to `TypeItem` and moved common predicates from `Struct`, `Enum`, and `Union` to `TypeItem`.
\ No newline at end of file

From 96a986228d24515594d30a49daf597ac2926a328 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Thu, 18 Dec 2025 09:04:07 +0100
Subject: [PATCH 8/8] Rust: Revert accidental changes

---
 .../upgrade.properties                                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/downgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties b/rust/downgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties
index bb950e335a96..d753a48ad740 100644
--- a/rust/downgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties
+++ b/rust/downgrades/e54d01f67a416b3d6eb7b970f27295097f2cac7f/upgrade.properties
@@ -1,5 +1,5 @@
-description: Added the `@type_item` union type
-compatibility: full
+description: Added the `@call_expr_base` union type
+compatibility: backwards
 
 call_expr_arg_lists.rel: delete
 call_expr_attrs.rel: delete