diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 795e5d0a5506a..b68bed7b96675 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 ec9ec5e218af9a6b449b40f716e00bbe23c2777941d105b9ed68071aa2468ca2 ec9ec5e218af9a6b449b40f716e00bbe23c2777941d105b9ed68071aa2468ca2
+top.rs 6ebb6a7d13c46a9d330f2a4d9851e5bbca800b305d0633e1fad6ea8d0f4839e6 6ebb6a7d13c46a9d330f2a4d9851e5bbca800b305d0633e1fad6ea8d0f4839e6
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 397120818723e..81e5e08c759d7 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -78,7 +78,17 @@ impl From<trap::Label<AstNode>> for trap::Label<Locatable> {
 
 #[derive(Debug)]
 pub struct Missing {
-    _unused: ()
+    pub id: trap::TrapId<Missing>,
+}
+
+impl trap::TrapEntry for Missing {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("missings", vec![id.into()]);
+    }
 }
 
 impl trap::TrapClass for Missing {
@@ -105,7 +115,17 @@ impl From<trap::Label<Missing>> for trap::Label<Unextracted> {
 
 #[derive(Debug)]
 pub struct Unimplemented {
-    _unused: ()
+    pub id: trap::TrapId<Unimplemented>,
+}
+
+impl trap::TrapEntry for Unimplemented {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("unimplementeds", vec![id.into()]);
+    }
 }
 
 impl trap::TrapClass for Unimplemented {
@@ -131,35 +151,45 @@ impl From<trap::Label<Unimplemented>> for trap::Label<Unextracted> {
 }
 
 #[derive(Debug)]
-pub struct Declaration {
-    _unused: ()
+pub struct Abi {
+    pub id: trap::TrapId<Abi>,
+}
+
+impl trap::TrapEntry for Abi {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("abis", vec![id.into()]);
+    }
 }
 
-impl trap::TrapClass for Declaration {
-    fn class_name() -> &'static str { "Declaration" }
+impl trap::TrapClass for Abi {
+    fn class_name() -> &'static str { "Abi" }
 }
 
-impl From<trap::Label<Declaration>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Declaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Declaration is a subclass of AstNode
+impl From<trap::Label<Abi>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Abi>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Abi is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Declaration>> for trap::Label<Element> {
-    fn from(value: trap::Label<Declaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Declaration is a subclass of Element
+impl From<trap::Label<Abi>> for trap::Label<Element> {
+    fn from(value: trap::Label<Abi>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Abi is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Declaration>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Declaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Declaration is a subclass of Locatable
+impl From<trap::Label<Abi>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Abi>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Abi is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -167,35 +197,35 @@ impl From<trap::Label<Declaration>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct Expr {
+pub struct Adt {
     _unused: ()
 }
 
-impl trap::TrapClass for Expr {
-    fn class_name() -> &'static str { "Expr" }
+impl trap::TrapClass for Adt {
+    fn class_name() -> &'static str { "Adt" }
 }
 
-impl From<trap::Label<Expr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Expr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Expr is a subclass of AstNode
+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<Expr>> for trap::Label<Element> {
-    fn from(value: trap::Label<Expr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Expr is a subclass of Element
+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<Expr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Expr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Expr is a subclass of Locatable
+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())
         }
@@ -203,63 +233,49 @@ impl From<trap::Label<Expr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct GenericArgList {
-    pub id: trap::TrapId<GenericArgList>,
+pub struct ArgList {
+    pub id: trap::TrapId<ArgList>,
+    pub args: Vec<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for GenericArgList {
+impl trap::TrapEntry for ArgList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("generic_arg_lists", vec![id.into()]);
-    }
-}
-
-impl trap::TrapClass for GenericArgList {
-    fn class_name() -> &'static str { "GenericArgList" }
-}
-
-impl From<trap::Label<GenericArgList>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<GenericArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
+        out.add_tuple("arg_lists", vec![id.into()]);
+        for (i, v) in self.args.into_iter().enumerate() {
+            out.add_tuple("arg_list_args", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl From<trap::Label<GenericArgList>> for trap::Label<Element> {
-    fn from(value: trap::Label<GenericArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for ArgList {
+    fn class_name() -> &'static str { "ArgList" }
 }
 
-impl From<trap::Label<GenericArgList>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<GenericArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Locatable
+impl From<trap::Label<ArgList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ArgList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArgList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<GenericArgList>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<GenericArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Unextracted
+impl From<trap::Label<ArgList>> for trap::Label<Element> {
+    fn from(value: trap::Label<ArgList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArgList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<GenericArgList>> for trap::Label<Unimplemented> {
-    fn from(value: trap::Label<GenericArgList>) -> Self {
-        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Unimplemented
+impl From<trap::Label<ArgList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ArgList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArgList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -267,46 +283,35 @@ impl From<trap::Label<GenericArgList>> for trap::Label<Unimplemented> {
 }
 
 #[derive(Debug)]
-pub struct Label {
-    pub id: trap::TrapId<Label>,
-    pub name: String,
-}
-
-impl trap::TrapEntry for Label {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("labels", vec![id.into(), self.name.into()]);
-    }
+pub struct AssocItem {
+    _unused: ()
 }
 
-impl trap::TrapClass for Label {
-    fn class_name() -> &'static str { "Label" }
+impl trap::TrapClass for AssocItem {
+    fn class_name() -> &'static str { "AssocItem" }
 }
 
-impl From<trap::Label<Label>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Label>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Label is a subclass of AstNode
+impl From<trap::Label<AssocItem>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<AssocItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItem is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Label>> for trap::Label<Element> {
-    fn from(value: trap::Label<Label>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Label is a subclass of Element
+impl From<trap::Label<AssocItem>> for trap::Label<Element> {
+    fn from(value: trap::Label<AssocItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItem is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Label>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Label>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Label is a subclass of Locatable
+impl From<trap::Label<AssocItem>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<AssocItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItem is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -314,51 +319,53 @@ impl From<trap::Label<Label>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct MatchArm {
-    pub id: trap::TrapId<MatchArm>,
-    pub pat: trap::Label<Pat>,
-    pub guard: Option<trap::Label<Expr>>,
-    pub expr: trap::Label<Expr>,
+pub struct AssocItemList {
+    pub id: trap::TrapId<AssocItemList>,
+    pub assoc_items: Vec<trap::Label<AssocItem>>,
+    pub attrs: Vec<trap::Label<Attr>>,
 }
 
-impl trap::TrapEntry for MatchArm {
+impl trap::TrapEntry for AssocItemList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("match_arms", vec![id.into(), self.pat.into(), self.expr.into()]);
-        if let Some(v) = self.guard {
-            out.add_tuple("match_arm_guards", vec![id.into(), v.into()]);
+        out.add_tuple("assoc_item_lists", vec![id.into()]);
+        for (i, v) in self.assoc_items.into_iter().enumerate() {
+            out.add_tuple("assoc_item_list_assoc_items", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("assoc_item_list_attrs", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for MatchArm {
-    fn class_name() -> &'static str { "MatchArm" }
+impl trap::TrapClass for AssocItemList {
+    fn class_name() -> &'static str { "AssocItemList" }
 }
 
-impl From<trap::Label<MatchArm>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MatchArm>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchArm is a subclass of AstNode
+impl From<trap::Label<AssocItemList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<AssocItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItemList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MatchArm>> for trap::Label<Element> {
-    fn from(value: trap::Label<MatchArm>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchArm is a subclass of Element
+impl From<trap::Label<AssocItemList>> for trap::Label<Element> {
+    fn from(value: trap::Label<AssocItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItemList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MatchArm>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MatchArm>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchArm is a subclass of Locatable
+impl From<trap::Label<AssocItemList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<AssocItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocItemList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -366,35 +373,49 @@ impl From<trap::Label<MatchArm>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct Pat {
-    _unused: ()
+pub struct Attr {
+    pub id: trap::TrapId<Attr>,
+    pub meta: Option<trap::Label<Meta>>,
 }
 
-impl trap::TrapClass for Pat {
-    fn class_name() -> &'static str { "Pat" }
+impl trap::TrapEntry for Attr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("attrs", vec![id.into()]);
+        if let Some(v) = self.meta {
+            out.add_tuple("attr_meta", vec![id.into(), v.into()]);
+        }
+    }
 }
 
-impl From<trap::Label<Pat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Pat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Pat is a subclass of AstNode
+impl trap::TrapClass for Attr {
+    fn class_name() -> &'static str { "Attr" }
+}
+
+impl From<trap::Label<Attr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Attr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Pat>> for trap::Label<Element> {
-    fn from(value: trap::Label<Pat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Pat is a subclass of Element
+impl From<trap::Label<Attr>> for trap::Label<Element> {
+    fn from(value: trap::Label<Attr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Pat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Pat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Pat is a subclass of Locatable
+impl From<trap::Label<Attr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Attr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Attr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -402,111 +423,121 @@ impl From<trap::Label<Pat>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct Path {
-    pub id: trap::TrapId<Path>,
+pub struct ClosureBinder {
+    pub id: trap::TrapId<ClosureBinder>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
 }
 
-impl trap::TrapEntry for Path {
+impl trap::TrapEntry for ClosureBinder {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("paths", vec![id.into()]);
+        out.add_tuple("closure_binders", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("closure_binder_generic_param_lists", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for Path {
-    fn class_name() -> &'static str { "Path" }
+impl trap::TrapClass for ClosureBinder {
+    fn class_name() -> &'static str { "ClosureBinder" }
 }
 
-impl From<trap::Label<Path>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of AstNode
+impl From<trap::Label<ClosureBinder>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ClosureBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Path>> for trap::Label<Element> {
-    fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of Element
+impl From<trap::Label<ClosureBinder>> for trap::Label<Element> {
+    fn from(value: trap::Label<ClosureBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Path>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of Locatable
+impl From<trap::Label<ClosureBinder>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ClosureBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Path>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of Unextracted
+#[derive(Debug)]
+pub struct Expr {
+    _unused: ()
+}
+
+impl trap::TrapClass for Expr {
+    fn class_name() -> &'static str { "Expr" }
+}
+
+impl From<trap::Label<Expr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Expr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Expr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Path>> for trap::Label<Unimplemented> {
-    fn from(value: trap::Label<Path>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Path is a subclass of Unimplemented
+impl From<trap::Label<Expr>> for trap::Label<Element> {
+    fn from(value: trap::Label<Expr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Expr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-#[derive(Debug)]
-pub struct RecordExprField {
-    pub id: trap::TrapId<RecordExprField>,
-    pub name: String,
-    pub expr: trap::Label<Expr>,
-}
-
-impl trap::TrapEntry for RecordExprField {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
+impl From<trap::Label<Expr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Expr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Expr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
     }
+}
 
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("record_expr_fields", vec![id.into(), self.name.into(), self.expr.into()]);
-    }
+#[derive(Debug)]
+pub struct ExternItem {
+    _unused: ()
 }
 
-impl trap::TrapClass for RecordExprField {
-    fn class_name() -> &'static str { "RecordExprField" }
+impl trap::TrapClass for ExternItem {
+    fn class_name() -> &'static str { "ExternItem" }
 }
 
-impl From<trap::Label<RecordExprField>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordExprField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExprField is a subclass of AstNode
+impl From<trap::Label<ExternItem>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ExternItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItem is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExprField>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordExprField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExprField is a subclass of Element
+impl From<trap::Label<ExternItem>> for trap::Label<Element> {
+    fn from(value: trap::Label<ExternItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItem is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExprField>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordExprField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExprField is a subclass of Locatable
+impl From<trap::Label<ExternItem>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ExternItem>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItem is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -514,47 +545,53 @@ impl From<trap::Label<RecordExprField>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RecordPatField {
-    pub id: trap::TrapId<RecordPatField>,
-    pub name: String,
-    pub pat: trap::Label<Pat>,
+pub struct ExternItemList {
+    pub id: trap::TrapId<ExternItemList>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub extern_items: Vec<trap::Label<ExternItem>>,
 }
 
-impl trap::TrapEntry for RecordPatField {
+impl trap::TrapEntry for ExternItemList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("record_pat_fields", vec![id.into(), self.name.into(), self.pat.into()]);
+        out.add_tuple("extern_item_lists", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("extern_item_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.extern_items.into_iter().enumerate() {
+            out.add_tuple("extern_item_list_extern_items", vec![id.into(), i.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for RecordPatField {
-    fn class_name() -> &'static str { "RecordPatField" }
+impl trap::TrapClass for ExternItemList {
+    fn class_name() -> &'static str { "ExternItemList" }
 }
 
-impl From<trap::Label<RecordPatField>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordPatField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPatField is a subclass of AstNode
+impl From<trap::Label<ExternItemList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ExternItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItemList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPatField>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordPatField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPatField is a subclass of Element
+impl From<trap::Label<ExternItemList>> for trap::Label<Element> {
+    fn from(value: trap::Label<ExternItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItemList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPatField>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordPatField>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPatField is a subclass of Locatable
+impl From<trap::Label<ExternItemList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ExternItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternItemList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -562,35 +599,35 @@ impl From<trap::Label<RecordPatField>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct Stmt {
+pub struct FieldList {
     _unused: ()
 }
 
-impl trap::TrapClass for Stmt {
-    fn class_name() -> &'static str { "Stmt" }
+impl trap::TrapClass for FieldList {
+    fn class_name() -> &'static str { "FieldList" }
 }
 
-impl From<trap::Label<Stmt>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Stmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of AstNode
+impl From<trap::Label<FieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FieldList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Stmt>> for trap::Label<Element> {
-    fn from(value: trap::Label<Stmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of Element
+impl From<trap::Label<FieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<FieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FieldList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Stmt>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Stmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of Locatable
+impl From<trap::Label<FieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FieldList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -598,63 +635,53 @@ impl From<trap::Label<Stmt>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct TypeRef {
-    pub id: trap::TrapId<TypeRef>,
+pub struct FormatArgsArg {
+    pub id: trap::TrapId<FormatArgsArg>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub name: Option<trap::Label<Name>>,
 }
 
-impl trap::TrapEntry for TypeRef {
+impl trap::TrapEntry for FormatArgsArg {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("type_refs", vec![id.into()]);
-    }
-}
-
-impl trap::TrapClass for TypeRef {
-    fn class_name() -> &'static str { "TypeRef" }
-}
-
-impl From<trap::Label<TypeRef>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
+        out.add_tuple("format_args_args", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("format_args_arg_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("format_args_arg_names", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<Element> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for FormatArgsArg {
+    fn class_name() -> &'static str { "FormatArgsArg" }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of Locatable
+impl From<trap::Label<FormatArgsArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FormatArgsArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsArg is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of Unextracted
+impl From<trap::Label<FormatArgsArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<FormatArgsArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsArg is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<Unimplemented> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of Unimplemented
+impl From<trap::Label<FormatArgsArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FormatArgsArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsArg is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -662,44 +689,35 @@ impl From<trap::Label<TypeRef>> for trap::Label<Unimplemented> {
 }
 
 #[derive(Debug)]
-pub struct ArrayExpr {
+pub struct GenericArg {
     _unused: ()
 }
 
-impl trap::TrapClass for ArrayExpr {
-    fn class_name() -> &'static str { "ArrayExpr" }
+impl trap::TrapClass for GenericArg {
+    fn class_name() -> &'static str { "GenericArg" }
 }
 
-impl From<trap::Label<ArrayExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ArrayExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of AstNode
+impl From<trap::Label<GenericArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<GenericArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericArg is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ArrayExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of Element
+impl From<trap::Label<GenericArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<GenericArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericArg is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ArrayExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<ArrayExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ArrayExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of Locatable
+impl From<trap::Label<GenericArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<GenericArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericArg is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -707,55 +725,85 @@ impl From<trap::Label<ArrayExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct AsmExpr {
-    pub id: trap::TrapId<AsmExpr>,
-    pub expr: trap::Label<Expr>,
+pub struct GenericArgList {
+    pub id: trap::TrapId<GenericArgList>,
+    pub generic_args: Vec<trap::Label<GenericArg>>,
 }
 
-impl trap::TrapEntry for AsmExpr {
+impl trap::TrapEntry for GenericArgList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("asm_exprs", vec![id.into(), self.expr.into()]);
+        out.add_tuple("generic_arg_lists", vec![id.into()]);
+        for (i, v) in self.generic_args.into_iter().enumerate() {
+            out.add_tuple("generic_arg_list_generic_args", vec![id.into(), i.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for AsmExpr {
-    fn class_name() -> &'static str { "AsmExpr" }
+impl trap::TrapClass for GenericArgList {
+    fn class_name() -> &'static str { "GenericArgList" }
 }
 
-impl From<trap::Label<AsmExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of AstNode
+impl From<trap::Label<GenericArgList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<GenericArgList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Element
+impl From<trap::Label<GenericArgList>> for trap::Label<Element> {
+    fn from(value: trap::Label<GenericArgList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Expr
+impl From<trap::Label<GenericArgList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<GenericArgList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericArgList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsmExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Locatable
+#[derive(Debug)]
+pub struct GenericParam {
+    _unused: ()
+}
+
+impl trap::TrapClass for GenericParam {
+    fn class_name() -> &'static str { "GenericParam" }
+}
+
+impl From<trap::Label<GenericParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<GenericParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParam is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<GenericParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<GenericParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParam is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<GenericParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<GenericParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParam is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -763,55 +811,49 @@ impl From<trap::Label<AsmExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct AwaitExpr {
-    pub id: trap::TrapId<AwaitExpr>,
-    pub expr: trap::Label<Expr>,
+pub struct GenericParamList {
+    pub id: trap::TrapId<GenericParamList>,
+    pub generic_params: Vec<trap::Label<GenericParam>>,
 }
 
-impl trap::TrapEntry for AwaitExpr {
+impl trap::TrapEntry for GenericParamList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("await_exprs", vec![id.into(), self.expr.into()]);
+        out.add_tuple("generic_param_lists", vec![id.into()]);
+        for (i, v) in self.generic_params.into_iter().enumerate() {
+            out.add_tuple("generic_param_list_generic_params", vec![id.into(), i.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for AwaitExpr {
-    fn class_name() -> &'static str { "AwaitExpr" }
-}
-
-impl From<trap::Label<AwaitExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<AwaitExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for GenericParamList {
+    fn class_name() -> &'static str { "GenericParamList" }
 }
 
-impl From<trap::Label<AwaitExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<AwaitExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Element
+impl From<trap::Label<GenericParamList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<GenericParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParamList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AwaitExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<AwaitExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Expr
+impl From<trap::Label<GenericParamList>> for trap::Label<Element> {
+    fn from(value: trap::Label<GenericParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParamList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AwaitExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<AwaitExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Locatable
+impl From<trap::Label<GenericParamList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<GenericParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme GenericParamList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -819,55 +861,53 @@ impl From<trap::Label<AwaitExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct BecomeExpr {
-    pub id: trap::TrapId<BecomeExpr>,
-    pub expr: trap::Label<Expr>,
+pub struct ItemList {
+    pub id: trap::TrapId<ItemList>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub items: Vec<trap::Label<Item>>,
 }
 
-impl trap::TrapEntry for BecomeExpr {
+impl trap::TrapEntry for ItemList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("become_exprs", vec![id.into(), self.expr.into()]);
+        out.add_tuple("item_lists", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("item_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.items.into_iter().enumerate() {
+            out.add_tuple("item_list_items", vec![id.into(), i.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for BecomeExpr {
-    fn class_name() -> &'static str { "BecomeExpr" }
-}
-
-impl From<trap::Label<BecomeExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<BecomeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for ItemList {
+    fn class_name() -> &'static str { "ItemList" }
 }
 
-impl From<trap::Label<BecomeExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<BecomeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Element
+impl From<trap::Label<ItemList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ItemList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BecomeExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<BecomeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Expr
+impl From<trap::Label<ItemList>> for trap::Label<Element> {
+    fn from(value: trap::Label<ItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ItemList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BecomeExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<BecomeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Locatable
+impl From<trap::Label<ItemList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ItemList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ItemList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -875,60 +915,49 @@ impl From<trap::Label<BecomeExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct BinaryExpr {
-    pub id: trap::TrapId<BinaryExpr>,
-    pub lhs: trap::Label<Expr>,
-    pub rhs: trap::Label<Expr>,
-    pub op: Option<String>,
+pub struct Label {
+    pub id: trap::TrapId<Label>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
 }
 
-impl trap::TrapEntry for BinaryExpr {
+impl trap::TrapEntry for Label {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("binary_exprs", vec![id.into(), self.lhs.into(), self.rhs.into()]);
-        if let Some(v) = self.op {
-            out.add_tuple("binary_expr_ops", vec![id.into(), v.into()]);
+        out.add_tuple("labels", vec![id.into()]);
+        if let Some(v) = self.lifetime {
+            out.add_tuple("label_lifetimes", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for BinaryExpr {
-    fn class_name() -> &'static str { "BinaryExpr" }
-}
-
-impl From<trap::Label<BinaryExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<BinaryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for Label {
+    fn class_name() -> &'static str { "Label" }
 }
 
-impl From<trap::Label<BinaryExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<BinaryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Element
+impl From<trap::Label<Label>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Label>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Label is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BinaryExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<BinaryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Expr
+impl From<trap::Label<Label>> for trap::Label<Element> {
+    fn from(value: trap::Label<Label>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Label is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BinaryExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<BinaryExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Locatable
+impl From<trap::Label<Label>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Label>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Label is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -936,44 +965,49 @@ impl From<trap::Label<BinaryExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct BlockExprBase {
-    _unused: ()
+pub struct LetElse {
+    pub id: trap::TrapId<LetElse>,
+    pub block_expr: Option<trap::Label<BlockExpr>>,
 }
 
-impl trap::TrapClass for BlockExprBase {
-    fn class_name() -> &'static str { "BlockExprBase" }
-}
+impl trap::TrapEntry for LetElse {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
 
-impl From<trap::Label<BlockExprBase>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<BlockExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExprBase is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("let_elses", vec![id.into()]);
+        if let Some(v) = self.block_expr {
+            out.add_tuple("let_else_block_exprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl From<trap::Label<BlockExprBase>> for trap::Label<Element> {
-    fn from(value: trap::Label<BlockExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExprBase is a subclass of Element
+impl trap::TrapClass for LetElse {
+    fn class_name() -> &'static str { "LetElse" }
+}
+
+impl From<trap::Label<LetElse>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LetElse>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetElse is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BlockExprBase>> for trap::Label<Expr> {
-    fn from(value: trap::Label<BlockExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExprBase is a subclass of Expr
+impl From<trap::Label<LetElse>> for trap::Label<Element> {
+    fn from(value: trap::Label<LetElse>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetElse is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BlockExprBase>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<BlockExprBase>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExprBase is a subclass of Locatable
+impl From<trap::Label<LetElse>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LetElse>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetElse is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -981,55 +1015,45 @@ impl From<trap::Label<BlockExprBase>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct BoxExpr {
-    pub id: trap::TrapId<BoxExpr>,
-    pub expr: trap::Label<Expr>,
+pub struct Lifetime {
+    pub id: trap::TrapId<Lifetime>,
 }
 
-impl trap::TrapEntry for BoxExpr {
+impl trap::TrapEntry for Lifetime {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("box_exprs", vec![id.into(), self.expr.into()]);
+        out.add_tuple("lifetimes", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for BoxExpr {
-    fn class_name() -> &'static str { "BoxExpr" }
-}
-
-impl From<trap::Label<BoxExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<BoxExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for Lifetime {
+    fn class_name() -> &'static str { "Lifetime" }
 }
 
-impl From<trap::Label<BoxExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<BoxExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxExpr is a subclass of Element
+impl From<trap::Label<Lifetime>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Lifetime>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BoxExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<BoxExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxExpr is a subclass of Expr
+impl From<trap::Label<Lifetime>> for trap::Label<Element> {
+    fn from(value: trap::Label<Lifetime>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BoxExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<BoxExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxExpr is a subclass of Locatable
+impl From<trap::Label<Lifetime>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Lifetime>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Lifetime is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1037,55 +1061,49 @@ impl From<trap::Label<BoxExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct BoxPat {
-    pub id: trap::TrapId<BoxPat>,
-    pub inner: trap::Label<Pat>,
+pub struct MacroItems {
+    pub id: trap::TrapId<MacroItems>,
+    pub items: Vec<trap::Label<Item>>,
 }
 
-impl trap::TrapEntry for BoxPat {
+impl trap::TrapEntry for MacroItems {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("box_pats", vec![id.into(), self.inner.into()]);
+        out.add_tuple("macro_items", vec![id.into()]);
+        for (i, v) in self.items.into_iter().enumerate() {
+            out.add_tuple("macro_items_items", vec![id.into(), i.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for BoxPat {
-    fn class_name() -> &'static str { "BoxPat" }
-}
-
-impl From<trap::Label<BoxPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<BoxPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for MacroItems {
+    fn class_name() -> &'static str { "MacroItems" }
 }
 
-impl From<trap::Label<BoxPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<BoxPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of Element
+impl From<trap::Label<MacroItems>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroItems>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BoxPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<BoxPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of Locatable
+impl From<trap::Label<MacroItems>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroItems>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BoxPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<BoxPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of Pat
+impl From<trap::Label<MacroItems>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroItems>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroItems is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1093,62 +1111,53 @@ impl From<trap::Label<BoxPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct BreakExpr {
-    pub id: trap::TrapId<BreakExpr>,
+pub struct MacroStmts {
+    pub id: trap::TrapId<MacroStmts>,
     pub expr: Option<trap::Label<Expr>>,
-    pub label: Option<trap::Label<Label>>,
+    pub statements: Vec<trap::Label<Stmt>>,
 }
 
-impl trap::TrapEntry for BreakExpr {
+impl trap::TrapEntry for MacroStmts {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("break_exprs", vec![id.into()]);
+        out.add_tuple("macro_stmts", vec![id.into()]);
         if let Some(v) = self.expr {
-            out.add_tuple("break_expr_exprs", vec![id.into(), v.into()]);
+            out.add_tuple("macro_stmts_exprs", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.label {
-            out.add_tuple("break_expr_labels", vec![id.into(), v.into()]);
+        for (i, v) in self.statements.into_iter().enumerate() {
+            out.add_tuple("macro_stmts_statements", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for BreakExpr {
-    fn class_name() -> &'static str { "BreakExpr" }
-}
-
-impl From<trap::Label<BreakExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<BreakExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for MacroStmts {
+    fn class_name() -> &'static str { "MacroStmts" }
 }
 
-impl From<trap::Label<BreakExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<BreakExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Element
+impl From<trap::Label<MacroStmts>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroStmts>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BreakExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<BreakExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Expr
+impl From<trap::Label<MacroStmts>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroStmts>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BreakExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<BreakExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Locatable
+impl From<trap::Label<MacroStmts>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroStmts>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroStmts is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1156,63 +1165,61 @@ impl From<trap::Label<BreakExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct CallExpr {
-    pub id: trap::TrapId<CallExpr>,
-    pub callee: trap::Label<Expr>,
-    pub args: Vec<trap::Label<Expr>>,
-    pub is_assignee_expr: bool,
+pub struct MatchArm {
+    pub id: trap::TrapId<MatchArm>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub guard: Option<trap::Label<MatchGuard>>,
+    pub pat: Option<trap::Label<Pat>>,
 }
 
-impl trap::TrapEntry for CallExpr {
+impl trap::TrapEntry for MatchArm {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("call_exprs", vec![id.into(), self.callee.into()]);
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("call_expr_args", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("match_arms", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("match_arm_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if self.is_assignee_expr {
-            out.add_tuple("call_expr_is_assignee_expr", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("match_arm_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.guard {
+            out.add_tuple("match_arm_guards", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("match_arm_pats", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for CallExpr {
-    fn class_name() -> &'static str { "CallExpr" }
-}
-
-impl From<trap::Label<CallExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for MatchArm {
+    fn class_name() -> &'static str { "MatchArm" }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Element
+impl From<trap::Label<MatchArm>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MatchArm>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchArm is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Expr
+impl From<trap::Label<MatchArm>> for trap::Label<Element> {
+    fn from(value: trap::Label<MatchArm>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchArm is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CallExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<CallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Locatable
+impl From<trap::Label<MatchArm>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MatchArm>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchArm is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1220,56 +1227,53 @@ impl From<trap::Label<CallExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct CastExpr {
-    pub id: trap::TrapId<CastExpr>,
-    pub expr: trap::Label<Expr>,
-    pub type_: trap::Label<TypeRef>,
+pub struct MatchArmList {
+    pub id: trap::TrapId<MatchArmList>,
+    pub arms: Vec<trap::Label<MatchArm>>,
+    pub attrs: Vec<trap::Label<Attr>>,
 }
 
-impl trap::TrapEntry for CastExpr {
+impl trap::TrapEntry for MatchArmList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("cast_exprs", vec![id.into(), self.expr.into(), self.type_.into()]);
-    }
-}
-
-impl trap::TrapClass for CastExpr {
-    fn class_name() -> &'static str { "CastExpr" }
-}
-
-impl From<trap::Label<CastExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<CastExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
+        out.add_tuple("match_arm_lists", vec![id.into()]);
+        for (i, v) in self.arms.into_iter().enumerate() {
+            out.add_tuple("match_arm_list_arms", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("match_arm_list_attrs", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl From<trap::Label<CastExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<CastExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Element
+impl trap::TrapClass for MatchArmList {
+    fn class_name() -> &'static str { "MatchArmList" }
+}
+
+impl From<trap::Label<MatchArmList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MatchArmList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchArmList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CastExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<CastExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Expr
+impl From<trap::Label<MatchArmList>> for trap::Label<Element> {
+    fn from(value: trap::Label<MatchArmList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchArmList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<CastExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<CastExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Locatable
+impl From<trap::Label<MatchArmList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MatchArmList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchArmList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1277,74 +1281,49 @@ impl From<trap::Label<CastExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ClosureExpr {
-    pub id: trap::TrapId<ClosureExpr>,
-    pub args: Vec<trap::Label<Pat>>,
-    pub arg_types: Vec<Option<trap::Label<TypeRef>>>,
-    pub ret_type: Option<trap::Label<TypeRef>>,
-    pub body: trap::Label<Expr>,
-    pub closure_kind: String,
-    pub is_move: bool,
+pub struct MatchGuard {
+    pub id: trap::TrapId<MatchGuard>,
+    pub condition: Option<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for ClosureExpr {
+impl trap::TrapEntry for MatchGuard {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("closure_exprs", vec![id.into(), self.body.into(), self.closure_kind.into()]);
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("closure_expr_args", vec![id.into(), i.into(), v.into()]);
-        }
-        for (i, v) in self.arg_types.into_iter().enumerate() {
-            if let Some(v) = v {
-                out.add_tuple("closure_expr_arg_types", vec![id.into(), i.into(), v.into()]);
-            }
-        }
-        if let Some(v) = self.ret_type {
-            out.add_tuple("closure_expr_ret_types", vec![id.into(), v.into()]);
-        }
-        if self.is_move {
-            out.add_tuple("closure_expr_is_move", vec![id.into()]);
+        out.add_tuple("match_guards", vec![id.into()]);
+        if let Some(v) = self.condition {
+            out.add_tuple("match_guard_conditions", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ClosureExpr {
-    fn class_name() -> &'static str { "ClosureExpr" }
-}
-
-impl From<trap::Label<ClosureExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ClosureExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for MatchGuard {
+    fn class_name() -> &'static str { "MatchGuard" }
 }
 
-impl From<trap::Label<ClosureExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ClosureExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Element
+impl From<trap::Label<MatchGuard>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MatchGuard>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchGuard is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ClosureExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ClosureExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Expr
+impl From<trap::Label<MatchGuard>> for trap::Label<Element> {
+    fn from(value: trap::Label<MatchGuard>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchGuard is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ClosureExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ClosureExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Locatable
+impl From<trap::Label<MatchGuard>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MatchGuard>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchGuard is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1352,55 +1331,57 @@ impl From<trap::Label<ClosureExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ConstBlockPat {
-    pub id: trap::TrapId<ConstBlockPat>,
-    pub expr: trap::Label<Expr>,
+pub struct Meta {
+    pub id: trap::TrapId<Meta>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub path: Option<trap::Label<Path>>,
+    pub token_tree: Option<trap::Label<TokenTree>>,
 }
 
-impl trap::TrapEntry for ConstBlockPat {
+impl trap::TrapEntry for Meta {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("const_block_pats", vec![id.into(), self.expr.into()]);
+        out.add_tuple("meta", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("meta_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.path {
+            out.add_tuple("meta_paths", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.token_tree {
+            out.add_tuple("meta_token_trees", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for ConstBlockPat {
-    fn class_name() -> &'static str { "ConstBlockPat" }
-}
-
-impl From<trap::Label<ConstBlockPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ConstBlockPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for Meta {
+    fn class_name() -> &'static str { "Meta" }
 }
 
-impl From<trap::Label<ConstBlockPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<ConstBlockPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of Element
+impl From<trap::Label<Meta>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Meta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Meta is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstBlockPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ConstBlockPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of Locatable
+impl From<trap::Label<Meta>> for trap::Label<Element> {
+    fn from(value: trap::Label<Meta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Meta is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstBlockPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<ConstBlockPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of Pat
+impl From<trap::Label<Meta>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Meta>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Meta is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1408,55 +1389,45 @@ impl From<trap::Label<ConstBlockPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct ConstExpr {
-    pub id: trap::TrapId<ConstExpr>,
-    pub expr: trap::Label<Expr>,
+pub struct Name {
+    pub id: trap::TrapId<Name>,
 }
 
-impl trap::TrapEntry for ConstExpr {
+impl trap::TrapEntry for Name {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("const_exprs", vec![id.into(), self.expr.into()]);
+        out.add_tuple("names", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for ConstExpr {
-    fn class_name() -> &'static str { "ConstExpr" }
-}
-
-impl From<trap::Label<ConstExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ConstExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for Name {
+    fn class_name() -> &'static str { "Name" }
 }
 
-impl From<trap::Label<ConstExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ConstExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstExpr is a subclass of Element
+impl From<trap::Label<Name>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Name>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Name is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ConstExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstExpr is a subclass of Expr
+impl From<trap::Label<Name>> for trap::Label<Element> {
+    fn from(value: trap::Label<Name>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Name is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ConstExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ConstExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ConstExpr is a subclass of Locatable
+impl From<trap::Label<Name>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Name>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Name is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1464,58 +1435,45 @@ impl From<trap::Label<ConstExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ContinueExpr {
-    pub id: trap::TrapId<ContinueExpr>,
-    pub label: Option<trap::Label<Label>>,
+pub struct NameRef {
+    pub id: trap::TrapId<NameRef>,
 }
 
-impl trap::TrapEntry for ContinueExpr {
+impl trap::TrapEntry for NameRef {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("continue_exprs", vec![id.into()]);
-        if let Some(v) = self.label {
-            out.add_tuple("continue_expr_labels", vec![id.into(), v.into()]);
-        }
+        out.add_tuple("name_refs", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for ContinueExpr {
-    fn class_name() -> &'static str { "ContinueExpr" }
-}
-
-impl From<trap::Label<ContinueExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for NameRef {
+    fn class_name() -> &'static str { "NameRef" }
 }
 
-impl From<trap::Label<ContinueExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Element
+impl From<trap::Label<NameRef>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<NameRef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ContinueExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Expr
+impl From<trap::Label<NameRef>> for trap::Label<Element> {
+    fn from(value: trap::Label<NameRef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ContinueExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ContinueExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Locatable
+impl From<trap::Label<NameRef>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<NameRef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NameRef is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1523,59 +1481,57 @@ impl From<trap::Label<ContinueExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ExprStmt {
-    pub id: trap::TrapId<ExprStmt>,
-    pub expr: trap::Label<Expr>,
-    pub has_semicolon: bool,
+pub struct Param {
+    pub id: trap::TrapId<Param>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub pat: Option<trap::Label<Pat>>,
+    pub ty: Option<trap::Label<Type>>,
 }
 
-impl trap::TrapEntry for ExprStmt {
+impl trap::TrapEntry for Param {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("expr_stmts", vec![id.into(), self.expr.into()]);
-        if self.has_semicolon {
-            out.add_tuple("expr_stmt_has_semicolon", vec![id.into()]);
+        out.add_tuple("params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("param_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("param_pats", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("param_ties", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ExprStmt {
-    fn class_name() -> &'static str { "ExprStmt" }
-}
-
-impl From<trap::Label<ExprStmt>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ExprStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for Param {
+    fn class_name() -> &'static str { "Param" }
 }
 
-impl From<trap::Label<ExprStmt>> for trap::Label<Element> {
-    fn from(value: trap::Label<ExprStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of Element
+impl From<trap::Label<Param>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExprStmt>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ExprStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of Locatable
+impl From<trap::Label<Param>> for trap::Label<Element> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ExprStmt>> for trap::Label<Stmt> {
-    fn from(value: trap::Label<ExprStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of Stmt
+impl From<trap::Label<Param>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1583,56 +1539,53 @@ impl From<trap::Label<ExprStmt>> for trap::Label<Stmt> {
 }
 
 #[derive(Debug)]
-pub struct FieldExpr {
-    pub id: trap::TrapId<FieldExpr>,
-    pub expr: trap::Label<Expr>,
-    pub name: String,
+pub struct ParamList {
+    pub id: trap::TrapId<ParamList>,
+    pub params: Vec<trap::Label<Param>>,
+    pub self_param: Option<trap::Label<SelfParam>>,
 }
 
-impl trap::TrapEntry for FieldExpr {
+impl trap::TrapEntry for ParamList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("field_exprs", vec![id.into(), self.expr.into(), self.name.into()]);
+        out.add_tuple("param_lists", vec![id.into()]);
+        for (i, v) in self.params.into_iter().enumerate() {
+            out.add_tuple("param_list_params", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.self_param {
+            out.add_tuple("param_list_self_params", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for FieldExpr {
-    fn class_name() -> &'static str { "FieldExpr" }
-}
-
-impl From<trap::Label<FieldExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<FieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for ParamList {
+    fn class_name() -> &'static str { "ParamList" }
 }
 
-impl From<trap::Label<FieldExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<FieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Element
+impl From<trap::Label<ParamList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParamList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FieldExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<FieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Expr
+impl From<trap::Label<ParamList>> for trap::Label<Element> {
+    fn from(value: trap::Label<ParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParamList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FieldExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<FieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Locatable
+impl From<trap::Label<ParamList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ParamList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParamList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1640,56 +1593,35 @@ impl From<trap::Label<FieldExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct Function {
-    pub id: trap::TrapId<Function>,
-    pub name: String,
-    pub body: trap::Label<Expr>,
-}
-
-impl trap::TrapEntry for Function {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("functions", vec![id.into(), self.name.into(), self.body.into()]);
-    }
-}
-
-impl trap::TrapClass for Function {
-    fn class_name() -> &'static str { "Function" }
+pub struct Pat {
+    _unused: ()
 }
 
-impl From<trap::Label<Function>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Function>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Function is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for Pat {
+    fn class_name() -> &'static str { "Pat" }
 }
 
-impl From<trap::Label<Function>> for trap::Label<Declaration> {
-    fn from(value: trap::Label<Function>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Function is a subclass of Declaration
+impl From<trap::Label<Pat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Pat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Pat is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Function>> for trap::Label<Element> {
-    fn from(value: trap::Label<Function>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Function is a subclass of Element
+impl From<trap::Label<Pat>> for trap::Label<Element> {
+    fn from(value: trap::Label<Pat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Pat is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Function>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Function>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Function is a subclass of Locatable
+impl From<trap::Label<Pat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Pat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Pat is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1697,59 +1629,53 @@ impl From<trap::Label<Function>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct IdentPat {
-    pub id: trap::TrapId<IdentPat>,
-    pub binding_id: String,
-    pub subpat: Option<trap::Label<Pat>>,
+pub struct Path {
+    pub id: trap::TrapId<Path>,
+    pub qualifier: Option<trap::Label<Path>>,
+    pub part: Option<trap::Label<PathSegment>>,
 }
 
-impl trap::TrapEntry for IdentPat {
+impl trap::TrapEntry for Path {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ident_pats", vec![id.into(), self.binding_id.into()]);
-        if let Some(v) = self.subpat {
-            out.add_tuple("ident_pat_subpats", vec![id.into(), v.into()]);
+        out.add_tuple("paths", vec![id.into()]);
+        if let Some(v) = self.qualifier {
+            out.add_tuple("path_qualifiers", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.part {
+            out.add_tuple("path_parts", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for IdentPat {
-    fn class_name() -> &'static str { "IdentPat" }
-}
-
-impl From<trap::Label<IdentPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<IdentPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for Path {
+    fn class_name() -> &'static str { "Path" }
 }
 
-impl From<trap::Label<IdentPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<IdentPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of Element
+impl From<trap::Label<Path>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Path>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Path is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IdentPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<IdentPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of Locatable
+impl From<trap::Label<Path>> for trap::Label<Element> {
+    fn from(value: trap::Label<Path>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Path is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IdentPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<IdentPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of Pat
+impl From<trap::Label<Path>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Path>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Path is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1757,60 +1683,73 @@ impl From<trap::Label<IdentPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct IfExpr {
-    pub id: trap::TrapId<IfExpr>,
-    pub condition: trap::Label<Expr>,
-    pub then: trap::Label<Expr>,
-    pub else_: Option<trap::Label<Expr>>,
-}
-
-impl trap::TrapEntry for IfExpr {
+pub struct PathSegment {
+    pub id: trap::TrapId<PathSegment>,
+    pub generic_arg_list: Option<trap::Label<GenericArgList>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+    pub param_list: Option<trap::Label<ParamList>>,
+    pub path_type: Option<trap::Label<PathType>>,
+    pub ret_type: Option<trap::Label<RetType>>,
+    pub return_type_syntax: Option<trap::Label<ReturnTypeSyntax>>,
+    pub ty: Option<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for PathSegment {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("if_exprs", vec![id.into(), self.condition.into(), self.then.into()]);
-        if let Some(v) = self.else_ {
-            out.add_tuple("if_expr_elses", vec![id.into(), v.into()]);
+        out.add_tuple("path_segments", vec![id.into()]);
+        if let Some(v) = self.generic_arg_list {
+            out.add_tuple("path_segment_generic_arg_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("path_segment_name_refs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.param_list {
+            out.add_tuple("path_segment_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.path_type {
+            out.add_tuple("path_segment_path_types", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ret_type {
+            out.add_tuple("path_segment_ret_types", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.return_type_syntax {
+            out.add_tuple("path_segment_return_type_syntaxes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("path_segment_ties", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for IfExpr {
-    fn class_name() -> &'static str { "IfExpr" }
+impl trap::TrapClass for PathSegment {
+    fn class_name() -> &'static str { "PathSegment" }
 }
 
-impl From<trap::Label<IfExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<IfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of AstNode
+impl From<trap::Label<PathSegment>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathSegment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathSegment is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IfExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<IfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Element
+impl From<trap::Label<PathSegment>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathSegment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathSegment is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IfExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<IfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<IfExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<IfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Locatable
+impl From<trap::Label<PathSegment>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathSegment>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathSegment is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1818,60 +1757,57 @@ impl From<trap::Label<IfExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct IndexExpr {
-    pub id: trap::TrapId<IndexExpr>,
-    pub base: trap::Label<Expr>,
-    pub index: trap::Label<Expr>,
-    pub is_assignee_expr: bool,
+pub struct RecordExprField {
+    pub id: trap::TrapId<RecordExprField>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
 }
 
-impl trap::TrapEntry for IndexExpr {
+impl trap::TrapEntry for RecordExprField {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("index_exprs", vec![id.into(), self.base.into(), self.index.into()]);
-        if self.is_assignee_expr {
-            out.add_tuple("index_expr_is_assignee_expr", vec![id.into()]);
+        out.add_tuple("record_expr_fields", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("record_expr_field_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("record_expr_field_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("record_expr_field_name_refs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for IndexExpr {
-    fn class_name() -> &'static str { "IndexExpr" }
-}
-
-impl From<trap::Label<IndexExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<IndexExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for RecordExprField {
+    fn class_name() -> &'static str { "RecordExprField" }
 }
 
-impl From<trap::Label<IndexExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<IndexExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Element
+impl From<trap::Label<RecordExprField>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordExprField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExprField is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IndexExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<IndexExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Expr
+impl From<trap::Label<RecordExprField>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordExprField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExprField is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<IndexExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<IndexExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Locatable
+impl From<trap::Label<RecordExprField>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordExprField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExprField is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1879,54 +1815,57 @@ impl From<trap::Label<IndexExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ItemStmt {
-    pub id: trap::TrapId<ItemStmt>,
+pub struct RecordExprFieldList {
+    pub id: trap::TrapId<RecordExprFieldList>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub fields: Vec<trap::Label<RecordExprField>>,
+    pub spread: Option<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for ItemStmt {
+impl trap::TrapEntry for RecordExprFieldList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("item_stmts", vec![id.into()]);
+        out.add_tuple("record_expr_field_lists", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("record_expr_field_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("record_expr_field_list_fields", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.spread {
+            out.add_tuple("record_expr_field_list_spreads", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for ItemStmt {
-    fn class_name() -> &'static str { "ItemStmt" }
-}
-
-impl From<trap::Label<ItemStmt>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ItemStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ItemStmt is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for RecordExprFieldList {
+    fn class_name() -> &'static str { "RecordExprFieldList" }
 }
 
-impl From<trap::Label<ItemStmt>> for trap::Label<Element> {
-    fn from(value: trap::Label<ItemStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ItemStmt is a subclass of Element
+impl From<trap::Label<RecordExprFieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordExprFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExprFieldList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ItemStmt>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ItemStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ItemStmt is a subclass of Locatable
+impl From<trap::Label<RecordExprFieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordExprFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExprFieldList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ItemStmt>> for trap::Label<Stmt> {
-    fn from(value: trap::Label<ItemStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ItemStmt is a subclass of Stmt
+impl From<trap::Label<RecordExprFieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordExprFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExprFieldList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1934,56 +1873,61 @@ impl From<trap::Label<ItemStmt>> for trap::Label<Stmt> {
 }
 
 #[derive(Debug)]
-pub struct LetExpr {
-    pub id: trap::TrapId<LetExpr>,
-    pub pat: trap::Label<Pat>,
-    pub expr: trap::Label<Expr>,
+pub struct RecordField {
+    pub id: trap::TrapId<RecordField>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<Type>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for LetExpr {
+impl trap::TrapEntry for RecordField {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("let_exprs", vec![id.into(), self.pat.into(), self.expr.into()]);
+        out.add_tuple("record_fields", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("record_field_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("record_field_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("record_field_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("record_field_visibilities", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for LetExpr {
-    fn class_name() -> &'static str { "LetExpr" }
-}
-
-impl From<trap::Label<LetExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<LetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for RecordField {
+    fn class_name() -> &'static str { "RecordField" }
 }
 
-impl From<trap::Label<LetExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<LetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Element
+impl From<trap::Label<RecordField>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordField is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LetExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<LetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Expr
+impl From<trap::Label<RecordField>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordField is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LetExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<LetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Locatable
+impl From<trap::Label<RecordField>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordField is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1991,67 +1935,57 @@ impl From<trap::Label<LetExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct LetStmt {
-    pub id: trap::TrapId<LetStmt>,
-    pub pat: trap::Label<Pat>,
-    pub type_: Option<trap::Label<TypeRef>>,
-    pub initializer: Option<trap::Label<Expr>>,
-    pub else_: Option<trap::Label<Expr>>,
+pub struct RecordPatField {
+    pub id: trap::TrapId<RecordPatField>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+    pub pat: Option<trap::Label<Pat>>,
 }
 
-impl trap::TrapEntry for LetStmt {
+impl trap::TrapEntry for RecordPatField {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("let_stmts", vec![id.into(), self.pat.into()]);
-        if let Some(v) = self.type_ {
-            out.add_tuple("let_stmt_types", vec![id.into(), v.into()]);
+        out.add_tuple("record_pat_fields", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("record_pat_field_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.initializer {
-            out.add_tuple("let_stmt_initializers", vec![id.into(), v.into()]);
+        if let Some(v) = self.name_ref {
+            out.add_tuple("record_pat_field_name_refs", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.else_ {
-            out.add_tuple("let_stmt_elses", vec![id.into(), v.into()]);
+        if let Some(v) = self.pat {
+            out.add_tuple("record_pat_field_pats", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for LetStmt {
-    fn class_name() -> &'static str { "LetStmt" }
-}
-
-impl From<trap::Label<LetStmt>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<LetStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for RecordPatField {
+    fn class_name() -> &'static str { "RecordPatField" }
 }
 
-impl From<trap::Label<LetStmt>> for trap::Label<Element> {
-    fn from(value: trap::Label<LetStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of Element
+impl From<trap::Label<RecordPatField>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordPatField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPatField is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LetStmt>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<LetStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of Locatable
+impl From<trap::Label<RecordPatField>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordPatField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPatField is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LetStmt>> for trap::Label<Stmt> {
-    fn from(value: trap::Label<LetStmt>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of Stmt
+impl From<trap::Label<RecordPatField>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordPatField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPatField is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2059,54 +1993,53 @@ impl From<trap::Label<LetStmt>> for trap::Label<Stmt> {
 }
 
 #[derive(Debug)]
-pub struct LiteralExpr {
-    pub id: trap::TrapId<LiteralExpr>,
+pub struct RecordPatFieldList {
+    pub id: trap::TrapId<RecordPatFieldList>,
+    pub fields: Vec<trap::Label<RecordPatField>>,
+    pub rest_pat: Option<trap::Label<RestPat>>,
 }
 
-impl trap::TrapEntry for LiteralExpr {
+impl trap::TrapEntry for RecordPatFieldList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("literal_exprs", vec![id.into()]);
+        out.add_tuple("record_pat_field_lists", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("record_pat_field_list_fields", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.rest_pat {
+            out.add_tuple("record_pat_field_list_rest_pats", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for LiteralExpr {
-    fn class_name() -> &'static str { "LiteralExpr" }
-}
-
-impl From<trap::Label<LiteralExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<LiteralExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for RecordPatFieldList {
+    fn class_name() -> &'static str { "RecordPatFieldList" }
 }
 
-impl From<trap::Label<LiteralExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<LiteralExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of Element
+impl From<trap::Label<RecordPatFieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordPatFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPatFieldList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LiteralExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<LiteralExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of Expr
+impl From<trap::Label<RecordPatFieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordPatFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPatFieldList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LiteralExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<LiteralExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralExpr is a subclass of Locatable
+impl From<trap::Label<RecordPatFieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordPatFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPatFieldList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2114,55 +2047,49 @@ impl From<trap::Label<LiteralExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct LiteralPat {
-    pub id: trap::TrapId<LiteralPat>,
-    pub expr: trap::Label<Expr>,
+pub struct Rename {
+    pub id: trap::TrapId<Rename>,
+    pub name: Option<trap::Label<Name>>,
 }
 
-impl trap::TrapEntry for LiteralPat {
+impl trap::TrapEntry for Rename {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("literal_pats", vec![id.into(), self.expr.into()]);
+        out.add_tuple("renames", vec![id.into()]);
+        if let Some(v) = self.name {
+            out.add_tuple("rename_names", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for LiteralPat {
-    fn class_name() -> &'static str { "LiteralPat" }
-}
-
-impl From<trap::Label<LiteralPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<LiteralPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for Rename {
+    fn class_name() -> &'static str { "Rename" }
 }
 
-impl From<trap::Label<LiteralPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<LiteralPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of Element
+impl From<trap::Label<Rename>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Rename>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Rename is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LiteralPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<LiteralPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of Locatable
+impl From<trap::Label<Rename>> for trap::Label<Element> {
+    fn from(value: trap::Label<Rename>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Rename is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LiteralPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<LiteralPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of Pat
+impl From<trap::Label<Rename>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Rename>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Rename is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2170,59 +2097,49 @@ impl From<trap::Label<LiteralPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct LoopExpr {
-    pub id: trap::TrapId<LoopExpr>,
-    pub body: trap::Label<Expr>,
-    pub label: Option<trap::Label<Label>>,
+pub struct RetType {
+    pub id: trap::TrapId<RetType>,
+    pub ty: Option<trap::Label<Type>>,
 }
 
-impl trap::TrapEntry for LoopExpr {
+impl trap::TrapEntry for RetType {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("loop_exprs", vec![id.into(), self.body.into()]);
-        if let Some(v) = self.label {
-            out.add_tuple("loop_expr_labels", vec![id.into(), v.into()]);
+        out.add_tuple("ret_types", vec![id.into()]);
+        if let Some(v) = self.ty {
+            out.add_tuple("ret_type_ties", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for LoopExpr {
-    fn class_name() -> &'static str { "LoopExpr" }
-}
-
-impl From<trap::Label<LoopExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<LoopExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for RetType {
+    fn class_name() -> &'static str { "RetType" }
 }
 
-impl From<trap::Label<LoopExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<LoopExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Element
+impl From<trap::Label<RetType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RetType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetType is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LoopExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<LoopExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Expr
+impl From<trap::Label<RetType>> for trap::Label<Element> {
+    fn from(value: trap::Label<RetType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetType is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<LoopExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<LoopExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Locatable
+impl From<trap::Label<RetType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RetType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetType is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2230,59 +2147,45 @@ impl From<trap::Label<LoopExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct MatchExpr {
-    pub id: trap::TrapId<MatchExpr>,
-    pub expr: trap::Label<Expr>,
-    pub branches: Vec<trap::Label<MatchArm>>,
+pub struct ReturnTypeSyntax {
+    pub id: trap::TrapId<ReturnTypeSyntax>,
 }
 
-impl trap::TrapEntry for MatchExpr {
+impl trap::TrapEntry for ReturnTypeSyntax {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("match_exprs", vec![id.into(), self.expr.into()]);
-        for (i, v) in self.branches.into_iter().enumerate() {
-            out.add_tuple("match_expr_branches", vec![id.into(), i.into(), v.into()]);
-        }
+        out.add_tuple("return_type_syntaxes", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for MatchExpr {
-    fn class_name() -> &'static str { "MatchExpr" }
-}
-
-impl From<trap::Label<MatchExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MatchExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for ReturnTypeSyntax {
+    fn class_name() -> &'static str { "ReturnTypeSyntax" }
 }
 
-impl From<trap::Label<MatchExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<MatchExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Element
+impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MatchExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<MatchExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Expr
+impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Element> {
+    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MatchExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MatchExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Locatable
+impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ReturnTypeSyntax>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnTypeSyntax is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2290,64 +2193,61 @@ impl From<trap::Label<MatchExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct MethodCallExpr {
-    pub id: trap::TrapId<MethodCallExpr>,
-    pub receiver: trap::Label<Expr>,
-    pub method_name: String,
-    pub args: Vec<trap::Label<Expr>>,
-    pub generic_args: Option<trap::Label<GenericArgList>>,
+pub struct SelfParam {
+    pub id: trap::TrapId<SelfParam>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<Type>>,
 }
 
-impl trap::TrapEntry for MethodCallExpr {
+impl trap::TrapEntry for SelfParam {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("method_call_exprs", vec![id.into(), self.receiver.into(), self.method_name.into()]);
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("method_call_expr_args", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("self_params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("self_param_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("self_param_lifetimes", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.generic_args {
-            out.add_tuple("method_call_expr_generic_args", vec![id.into(), v.into()]);
+        if let Some(v) = self.name {
+            out.add_tuple("self_param_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("self_param_ties", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for MethodCallExpr {
-    fn class_name() -> &'static str { "MethodCallExpr" }
-}
-
-impl From<trap::Label<MethodCallExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for SelfParam {
+    fn class_name() -> &'static str { "SelfParam" }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Element
+impl From<trap::Label<SelfParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<SelfParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Expr
+impl From<trap::Label<SelfParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<SelfParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Locatable
+impl From<trap::Label<SelfParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<SelfParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2355,72 +2255,89 @@ impl From<trap::Label<MethodCallExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct MissingExpr {
-    pub id: trap::TrapId<MissingExpr>,
+pub struct SourceFile {
+    pub id: trap::TrapId<SourceFile>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub items: Vec<trap::Label<Item>>,
 }
 
-impl trap::TrapEntry for MissingExpr {
+impl trap::TrapEntry for SourceFile {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("missing_exprs", vec![id.into()]);
+        out.add_tuple("source_files", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("source_file_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.items.into_iter().enumerate() {
+            out.add_tuple("source_file_items", vec![id.into(), i.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for MissingExpr {
-    fn class_name() -> &'static str { "MissingExpr" }
+impl trap::TrapClass for SourceFile {
+    fn class_name() -> &'static str { "SourceFile" }
 }
 
-impl From<trap::Label<MissingExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of AstNode
+impl From<trap::Label<SourceFile>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<SourceFile>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MissingExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of Element
+impl From<trap::Label<SourceFile>> for trap::Label<Element> {
+    fn from(value: trap::Label<SourceFile>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MissingExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of Expr
+impl From<trap::Label<SourceFile>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<SourceFile>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SourceFile is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MissingExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+#[derive(Debug)]
+pub struct Stmt {
+    _unused: ()
+}
+
+impl trap::TrapClass for Stmt {
+    fn class_name() -> &'static str { "Stmt" }
 }
 
-impl From<trap::Label<MissingExpr>> for trap::Label<Missing> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of Missing
+impl From<trap::Label<Stmt>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Stmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MissingExpr>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<MissingExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingExpr is a subclass of Unextracted
+impl From<trap::Label<Stmt>> for trap::Label<Element> {
+    fn from(value: trap::Label<Stmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Stmt>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Stmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Stmt is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2428,72 +2345,103 @@ impl From<trap::Label<MissingExpr>> for trap::Label<Unextracted> {
 }
 
 #[derive(Debug)]
-pub struct MissingPat {
-    pub id: trap::TrapId<MissingPat>,
+pub struct StmtList {
+    pub id: trap::TrapId<StmtList>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub statements: Vec<trap::Label<Stmt>>,
+    pub tail_expr: Option<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for MissingPat {
+impl trap::TrapEntry for StmtList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("missing_pats", vec![id.into()]);
+        out.add_tuple("stmt_lists", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("stmt_list_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.statements.into_iter().enumerate() {
+            out.add_tuple("stmt_list_statements", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.tail_expr {
+            out.add_tuple("stmt_list_tail_exprs", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for MissingPat {
-    fn class_name() -> &'static str { "MissingPat" }
+impl trap::TrapClass for StmtList {
+    fn class_name() -> &'static str { "StmtList" }
 }
 
-impl From<trap::Label<MissingPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of AstNode
+impl From<trap::Label<StmtList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StmtList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MissingPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of Element
+impl From<trap::Label<StmtList>> for trap::Label<Element> {
+    fn from(value: trap::Label<StmtList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MissingPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of Locatable
+impl From<trap::Label<StmtList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StmtList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StmtList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MissingPat>> for trap::Label<Missing> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of Missing
+#[derive(Debug)]
+pub struct TokenTree {
+    pub id: trap::TrapId<TokenTree>,
+}
+
+impl trap::TrapEntry for TokenTree {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("token_trees", vec![id.into()]);
+    }
+}
+
+impl trap::TrapClass for TokenTree {
+    fn class_name() -> &'static str { "TokenTree" }
+}
+
+impl From<trap::Label<TokenTree>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TokenTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TokenTree is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MissingPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of Pat
+impl From<trap::Label<TokenTree>> for trap::Label<Element> {
+    fn from(value: trap::Label<TokenTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TokenTree is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MissingPat>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<MissingPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MissingPat is a subclass of Unextracted
+impl From<trap::Label<TokenTree>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TokenTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TokenTree is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2501,58 +2449,93 @@ impl From<trap::Label<MissingPat>> for trap::Label<Unextracted> {
 }
 
 #[derive(Debug)]
-pub struct Module {
-    pub id: trap::TrapId<Module>,
-    pub declarations: Vec<trap::Label<Declaration>>,
+pub struct TupleField {
+    pub id: trap::TrapId<TupleField>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub ty: Option<trap::Label<Type>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for Module {
+impl trap::TrapEntry for TupleField {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("modules", vec![id.into()]);
-        for (i, v) in self.declarations.into_iter().enumerate() {
-            out.add_tuple("module_declarations", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("tuple_fields", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("tuple_field_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("tuple_field_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("tuple_field_visibilities", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for Module {
-    fn class_name() -> &'static str { "Module" }
+impl trap::TrapClass for TupleField {
+    fn class_name() -> &'static str { "TupleField" }
 }
 
-impl From<trap::Label<Module>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of AstNode
+impl From<trap::Label<TupleField>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleField is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Module>> for trap::Label<Declaration> {
-    fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of Declaration
+impl From<trap::Label<TupleField>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleField is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Module>> for trap::Label<Element> {
-    fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of Element
+impl From<trap::Label<TupleField>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleField>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleField is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Module>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Module>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Module is a subclass of Locatable
+#[derive(Debug)]
+pub struct Type {
+    _unused: ()
+}
+
+impl trap::TrapClass for Type {
+    fn class_name() -> &'static str { "Type" }
+}
+
+impl From<trap::Label<Type>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Type>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Type is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Type>> for trap::Label<Element> {
+    fn from(value: trap::Label<Type>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Type is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Type>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Type>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Type is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2560,59 +2543,57 @@ impl From<trap::Label<Module>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct OffsetOfExpr {
-    pub id: trap::TrapId<OffsetOfExpr>,
-    pub container: trap::Label<TypeRef>,
-    pub fields: Vec<String>,
+pub struct TypeBound {
+    pub id: trap::TrapId<TypeBound>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+    pub ty: Option<trap::Label<Type>>,
 }
 
-impl trap::TrapEntry for OffsetOfExpr {
+impl trap::TrapEntry for TypeBound {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("offset_of_exprs", vec![id.into(), self.container.into()]);
-        for (i, v) in self.fields.into_iter().enumerate() {
-            out.add_tuple("offset_of_expr_fields", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("type_bounds", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("type_bound_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("type_bound_lifetimes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("type_bound_ties", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for OffsetOfExpr {
-    fn class_name() -> &'static str { "OffsetOfExpr" }
-}
-
-impl From<trap::Label<OffsetOfExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<OffsetOfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for TypeBound {
+    fn class_name() -> &'static str { "TypeBound" }
 }
 
-impl From<trap::Label<OffsetOfExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<OffsetOfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Element
+impl From<trap::Label<TypeBound>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeBound>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBound is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<OffsetOfExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<OffsetOfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Expr
+impl From<trap::Label<TypeBound>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeBound>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBound is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<OffsetOfExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<OffsetOfExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Locatable
+impl From<trap::Label<TypeBound>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeBound>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBound is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2620,58 +2601,49 @@ impl From<trap::Label<OffsetOfExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct OrPat {
-    pub id: trap::TrapId<OrPat>,
-    pub args: Vec<trap::Label<Pat>>,
+pub struct TypeBoundList {
+    pub id: trap::TrapId<TypeBoundList>,
+    pub bounds: Vec<trap::Label<TypeBound>>,
 }
 
-impl trap::TrapEntry for OrPat {
+impl trap::TrapEntry for TypeBoundList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("or_pats", vec![id.into()]);
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("or_pat_args", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("type_bound_lists", vec![id.into()]);
+        for (i, v) in self.bounds.into_iter().enumerate() {
+            out.add_tuple("type_bound_list_bounds", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for OrPat {
-    fn class_name() -> &'static str { "OrPat" }
-}
-
-impl From<trap::Label<OrPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<OrPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for TypeBoundList {
+    fn class_name() -> &'static str { "TypeBoundList" }
 }
 
-impl From<trap::Label<OrPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<OrPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of Element
+impl From<trap::Label<TypeBoundList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeBoundList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBoundList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<OrPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<OrPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of Locatable
+impl From<trap::Label<TypeBoundList>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeBoundList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBoundList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<OrPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<OrPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of Pat
+impl From<trap::Label<TypeBoundList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeBoundList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeBoundList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2679,55 +2651,57 @@ impl From<trap::Label<OrPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct PathExpr {
-    pub id: trap::TrapId<PathExpr>,
-    pub path: trap::Label<Path>,
+pub struct UseTree {
+    pub id: trap::TrapId<UseTree>,
+    pub path: Option<trap::Label<Path>>,
+    pub rename: Option<trap::Label<Rename>>,
+    pub use_tree_list: Option<trap::Label<UseTreeList>>,
 }
 
-impl trap::TrapEntry for PathExpr {
+impl trap::TrapEntry for UseTree {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("path_exprs", vec![id.into(), self.path.into()]);
+        out.add_tuple("use_trees", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("use_tree_paths", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.rename {
+            out.add_tuple("use_tree_renames", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.use_tree_list {
+            out.add_tuple("use_tree_use_tree_lists", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for PathExpr {
-    fn class_name() -> &'static str { "PathExpr" }
-}
-
-impl From<trap::Label<PathExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for UseTree {
+    fn class_name() -> &'static str { "UseTree" }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Element
+impl From<trap::Label<UseTree>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<UseTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTree is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Expr
+impl From<trap::Label<UseTree>> for trap::Label<Element> {
+    fn from(value: trap::Label<UseTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTree is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Locatable
+impl From<trap::Label<UseTree>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<UseTree>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTree is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2735,55 +2709,49 @@ impl From<trap::Label<PathExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct PathPat {
-    pub id: trap::TrapId<PathPat>,
-    pub path: trap::Label<Path>,
+pub struct UseTreeList {
+    pub id: trap::TrapId<UseTreeList>,
+    pub use_trees: Vec<trap::Label<UseTree>>,
 }
 
-impl trap::TrapEntry for PathPat {
+impl trap::TrapEntry for UseTreeList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("path_pats", vec![id.into(), self.path.into()]);
+        out.add_tuple("use_tree_lists", vec![id.into()]);
+        for (i, v) in self.use_trees.into_iter().enumerate() {
+            out.add_tuple("use_tree_list_use_trees", vec![id.into(), i.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for PathPat {
-    fn class_name() -> &'static str { "PathPat" }
-}
-
-impl From<trap::Label<PathPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for UseTreeList {
+    fn class_name() -> &'static str { "UseTreeList" }
 }
 
-impl From<trap::Label<PathPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Element
+impl From<trap::Label<UseTreeList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<UseTreeList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTreeList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Locatable
+impl From<trap::Label<UseTreeList>> for trap::Label<Element> {
+    fn from(value: trap::Label<UseTreeList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTreeList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Pat
+impl From<trap::Label<UseTreeList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<UseTreeList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UseTreeList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2791,56 +2759,65 @@ impl From<trap::Label<PathPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct PrefixExpr {
-    pub id: trap::TrapId<PrefixExpr>,
-    pub expr: trap::Label<Expr>,
-    pub op: String,
+pub struct Variant {
+    pub id: trap::TrapId<Variant>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub field_list: Option<trap::Label<FieldList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for PrefixExpr {
+impl trap::TrapEntry for Variant {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("prefix_exprs", vec![id.into(), self.expr.into(), self.op.into()]);
+        out.add_tuple("variants", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("variant_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("variant_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.field_list {
+            out.add_tuple("variant_field_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("variant_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("variant_visibilities", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for PrefixExpr {
-    fn class_name() -> &'static str { "PrefixExpr" }
-}
-
-impl From<trap::Label<PrefixExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<PrefixExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for Variant {
+    fn class_name() -> &'static str { "Variant" }
 }
 
-impl From<trap::Label<PrefixExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<PrefixExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Element
+impl From<trap::Label<Variant>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Variant>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PrefixExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<PrefixExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Expr
+impl From<trap::Label<Variant>> for trap::Label<Element> {
+    fn from(value: trap::Label<Variant>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PrefixExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PrefixExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Locatable
+impl From<trap::Label<Variant>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Variant>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2848,66 +2825,49 @@ impl From<trap::Label<PrefixExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RangeExpr {
-    pub id: trap::TrapId<RangeExpr>,
-    pub lhs: Option<trap::Label<Expr>>,
-    pub rhs: Option<trap::Label<Expr>>,
-    pub is_inclusive: bool,
+pub struct VariantList {
+    pub id: trap::TrapId<VariantList>,
+    pub variants: Vec<trap::Label<Variant>>,
 }
 
-impl trap::TrapEntry for RangeExpr {
+impl trap::TrapEntry for VariantList {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("range_exprs", vec![id.into()]);
-        if let Some(v) = self.lhs {
-            out.add_tuple("range_expr_lhs", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.rhs {
-            out.add_tuple("range_expr_rhs", vec![id.into(), v.into()]);
-        }
-        if self.is_inclusive {
-            out.add_tuple("range_expr_is_inclusive", vec![id.into()]);
+        out.add_tuple("variant_lists", vec![id.into()]);
+        for (i, v) in self.variants.into_iter().enumerate() {
+            out.add_tuple("variant_list_variants", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RangeExpr {
-    fn class_name() -> &'static str { "RangeExpr" }
-}
-
-impl From<trap::Label<RangeExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RangeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for VariantList {
+    fn class_name() -> &'static str { "VariantList" }
 }
 
-impl From<trap::Label<RangeExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<RangeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Element
+impl From<trap::Label<VariantList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<VariantList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VariantList is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RangeExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<RangeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Expr
+impl From<trap::Label<VariantList>> for trap::Label<Element> {
+    fn from(value: trap::Label<VariantList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VariantList is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RangeExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RangeExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Locatable
+impl From<trap::Label<VariantList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<VariantList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme VariantList is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2915,62 +2875,49 @@ impl From<trap::Label<RangeExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RangePat {
-    pub id: trap::TrapId<RangePat>,
-    pub start: Option<trap::Label<Pat>>,
-    pub end: Option<trap::Label<Pat>>,
+pub struct Visibility {
+    pub id: trap::TrapId<Visibility>,
+    pub path: Option<trap::Label<Path>>,
 }
 
-impl trap::TrapEntry for RangePat {
+impl trap::TrapEntry for Visibility {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("range_pats", vec![id.into()]);
-        if let Some(v) = self.start {
-            out.add_tuple("range_pat_starts", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.end {
-            out.add_tuple("range_pat_ends", vec![id.into(), v.into()]);
+        out.add_tuple("visibilities", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("visibility_paths", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RangePat {
-    fn class_name() -> &'static str { "RangePat" }
+impl trap::TrapClass for Visibility {
+    fn class_name() -> &'static str { "Visibility" }
 }
 
-impl From<trap::Label<RangePat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RangePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of AstNode
+impl From<trap::Label<Visibility>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Visibility>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Visibility is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RangePat>> for trap::Label<Element> {
-    fn from(value: trap::Label<RangePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of Element
+impl From<trap::Label<Visibility>> for trap::Label<Element> {
+    fn from(value: trap::Label<Visibility>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Visibility is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RangePat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RangePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<RangePat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<RangePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of Pat
+impl From<trap::Label<Visibility>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Visibility>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Visibility is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2978,74 +2925,49 @@ impl From<trap::Label<RangePat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct RecordExpr {
-    pub id: trap::TrapId<RecordExpr>,
-    pub path: Option<trap::Label<Path>>,
-    pub flds: Vec<trap::Label<RecordExprField>>,
-    pub spread: Option<trap::Label<Expr>>,
-    pub has_ellipsis: bool,
-    pub is_assignee_expr: bool,
+pub struct WhereClause {
+    pub id: trap::TrapId<WhereClause>,
+    pub predicates: Vec<trap::Label<WherePred>>,
 }
 
-impl trap::TrapEntry for RecordExpr {
+impl trap::TrapEntry for WhereClause {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("record_exprs", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("record_expr_paths", vec![id.into(), v.into()]);
-        }
-        for (i, v) in self.flds.into_iter().enumerate() {
-            out.add_tuple("record_expr_flds", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.spread {
-            out.add_tuple("record_expr_spreads", vec![id.into(), v.into()]);
-        }
-        if self.has_ellipsis {
-            out.add_tuple("record_expr_has_ellipsis", vec![id.into()]);
-        }
-        if self.is_assignee_expr {
-            out.add_tuple("record_expr_is_assignee_expr", vec![id.into()]);
+        out.add_tuple("where_clauses", vec![id.into()]);
+        for (i, v) in self.predicates.into_iter().enumerate() {
+            out.add_tuple("where_clause_predicates", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RecordExpr {
-    fn class_name() -> &'static str { "RecordExpr" }
-}
-
-impl From<trap::Label<RecordExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for WhereClause {
+    fn class_name() -> &'static str { "WhereClause" }
 }
 
-impl From<trap::Label<RecordExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of Element
+impl From<trap::Label<WhereClause>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<WhereClause>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhereClause is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<RecordExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of Expr
+impl From<trap::Label<WhereClause>> for trap::Label<Element> {
+    fn from(value: trap::Label<WhereClause>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhereClause is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of Locatable
+impl From<trap::Label<WhereClause>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<WhereClause>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhereClause is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3053,66 +2975,61 @@ impl From<trap::Label<RecordExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RecordPat {
-    pub id: trap::TrapId<RecordPat>,
-    pub path: Option<trap::Label<Path>>,
-    pub flds: Vec<trap::Label<RecordPatField>>,
-    pub has_ellipsis: bool,
+pub struct WherePred {
+    pub id: trap::TrapId<WherePred>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+    pub ty: Option<trap::Label<Type>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
 
-impl trap::TrapEntry for RecordPat {
+impl trap::TrapEntry for WherePred {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("record_pats", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("record_pat_paths", vec![id.into(), v.into()]);
+        out.add_tuple("where_preds", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("where_pred_generic_param_lists", vec![id.into(), v.into()]);
         }
-        for (i, v) in self.flds.into_iter().enumerate() {
-            out.add_tuple("record_pat_flds", vec![id.into(), i.into(), v.into()]);
+        if let Some(v) = self.lifetime {
+            out.add_tuple("where_pred_lifetimes", vec![id.into(), v.into()]);
         }
-        if self.has_ellipsis {
-            out.add_tuple("record_pat_has_ellipsis", vec![id.into()]);
+        if let Some(v) = self.ty {
+            out.add_tuple("where_pred_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("where_pred_type_bound_lists", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RecordPat {
-    fn class_name() -> &'static str { "RecordPat" }
-}
-
-impl From<trap::Label<RecordPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RecordPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for WherePred {
+    fn class_name() -> &'static str { "WherePred" }
 }
 
-impl From<trap::Label<RecordPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<RecordPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of Element
+impl From<trap::Label<WherePred>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<WherePred>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WherePred is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RecordPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of Locatable
+impl From<trap::Label<WherePred>> for trap::Label<Element> {
+    fn from(value: trap::Label<WherePred>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WherePred is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RecordPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<RecordPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of Pat
+impl From<trap::Label<WherePred>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<WherePred>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WherePred is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3120,63 +3037,62 @@ impl From<trap::Label<RecordPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct RefExpr {
-    pub id: trap::TrapId<RefExpr>,
-    pub expr: trap::Label<Expr>,
-    pub is_raw: bool,
-    pub is_mut: bool,
+pub struct ArrayExpr {
+    pub id: trap::TrapId<ArrayExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub exprs: Vec<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for RefExpr {
+impl trap::TrapEntry for ArrayExpr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ref_exprs", vec![id.into(), self.expr.into()]);
-        if self.is_raw {
-            out.add_tuple("ref_expr_is_raw", vec![id.into()]);
+        out.add_tuple("array_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("array_expr_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if self.is_mut {
-            out.add_tuple("ref_expr_is_mut", vec![id.into()]);
+        for (i, v) in self.exprs.into_iter().enumerate() {
+            out.add_tuple("array_expr_exprs", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RefExpr {
-    fn class_name() -> &'static str { "RefExpr" }
+impl trap::TrapClass for ArrayExpr {
+    fn class_name() -> &'static str { "ArrayExpr" }
 }
 
-impl From<trap::Label<RefExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RefExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of AstNode
+impl From<trap::Label<ArrayExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ArrayExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<RefExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Element
+impl From<trap::Label<ArrayExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ArrayExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<RefExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Expr
+impl From<trap::Label<ArrayExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<ArrayExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RefExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Locatable
+impl From<trap::Label<ArrayExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ArrayExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3184,59 +3100,62 @@ impl From<trap::Label<RefExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RefPat {
-    pub id: trap::TrapId<RefPat>,
-    pub pat: trap::Label<Pat>,
-    pub is_mut: bool,
+pub struct ArrayType {
+    pub id: trap::TrapId<ArrayType>,
+    pub const_arg: Option<trap::Label<ConstArg>>,
+    pub ty: Option<trap::Label<Type>>,
 }
 
-impl trap::TrapEntry for RefPat {
+impl trap::TrapEntry for ArrayType {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ref_pats", vec![id.into(), self.pat.into()]);
-        if self.is_mut {
-            out.add_tuple("ref_pat_is_mut", vec![id.into()]);
+        out.add_tuple("array_types", vec![id.into()]);
+        if let Some(v) = self.const_arg {
+            out.add_tuple("array_type_const_args", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("array_type_ties", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RefPat {
-    fn class_name() -> &'static str { "RefPat" }
+impl trap::TrapClass for ArrayType {
+    fn class_name() -> &'static str { "ArrayType" }
 }
 
-impl From<trap::Label<RefPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RefPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of AstNode
+impl From<trap::Label<ArrayType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ArrayType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<RefPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of Element
+impl From<trap::Label<ArrayType>> for trap::Label<Element> {
+    fn from(value: trap::Label<ArrayType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RefPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of Locatable
+impl From<trap::Label<ArrayType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ArrayType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<RefPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of Pat
+impl From<trap::Label<ArrayType>> for trap::Label<Type> {
+    fn from(value: trap::Label<ArrayType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of Type
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3244,58 +3163,62 @@ impl From<trap::Label<RefPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct ReturnExpr {
-    pub id: trap::TrapId<ReturnExpr>,
+pub struct AsmExpr {
+    pub id: trap::TrapId<AsmExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
     pub expr: Option<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for ReturnExpr {
+impl trap::TrapEntry for AsmExpr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("return_exprs", vec![id.into()]);
+        out.add_tuple("asm_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("asm_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
         if let Some(v) = self.expr {
-            out.add_tuple("return_expr_exprs", vec![id.into(), v.into()]);
+            out.add_tuple("asm_expr_exprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ReturnExpr {
-    fn class_name() -> &'static str { "ReturnExpr" }
+impl trap::TrapClass for AsmExpr {
+    fn class_name() -> &'static str { "AsmExpr" }
 }
 
-impl From<trap::Label<ReturnExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ReturnExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of AstNode
+impl From<trap::Label<AsmExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ReturnExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ReturnExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Element
+impl From<trap::Label<AsmExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ReturnExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ReturnExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Expr
+impl From<trap::Label<AsmExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ReturnExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ReturnExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Locatable
+impl From<trap::Label<AsmExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3303,66 +3226,86 @@ impl From<trap::Label<ReturnExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct SlicePat {
-    pub id: trap::TrapId<SlicePat>,
-    pub prefix: Vec<trap::Label<Pat>>,
-    pub slice: Option<trap::Label<Pat>>,
-    pub suffix: Vec<trap::Label<Pat>>,
-}
-
-impl trap::TrapEntry for SlicePat {
+pub struct AssocTypeArg {
+    pub id: trap::TrapId<AssocTypeArg>,
+    pub const_arg: Option<trap::Label<ConstArg>>,
+    pub generic_arg_list: Option<trap::Label<GenericArgList>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+    pub param_list: Option<trap::Label<ParamList>>,
+    pub ret_type: Option<trap::Label<RetType>>,
+    pub return_type_syntax: Option<trap::Label<ReturnTypeSyntax>>,
+    pub ty: Option<trap::Label<Type>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+}
+
+impl trap::TrapEntry for AssocTypeArg {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("slice_pats", vec![id.into()]);
-        for (i, v) in self.prefix.into_iter().enumerate() {
-            out.add_tuple("slice_pat_prefixes", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("assoc_type_args", vec![id.into()]);
+        if let Some(v) = self.const_arg {
+            out.add_tuple("assoc_type_arg_const_args", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.slice {
-            out.add_tuple("slice_pat_slice", vec![id.into(), v.into()]);
+        if let Some(v) = self.generic_arg_list {
+            out.add_tuple("assoc_type_arg_generic_arg_lists", vec![id.into(), v.into()]);
         }
-        for (i, v) in self.suffix.into_iter().enumerate() {
-            out.add_tuple("slice_pat_suffixes", vec![id.into(), i.into(), v.into()]);
+        if let Some(v) = self.name_ref {
+            out.add_tuple("assoc_type_arg_name_refs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.param_list {
+            out.add_tuple("assoc_type_arg_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ret_type {
+            out.add_tuple("assoc_type_arg_ret_types", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.return_type_syntax {
+            out.add_tuple("assoc_type_arg_return_type_syntaxes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("assoc_type_arg_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("assoc_type_arg_type_bound_lists", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for SlicePat {
-    fn class_name() -> &'static str { "SlicePat" }
+impl trap::TrapClass for AssocTypeArg {
+    fn class_name() -> &'static str { "AssocTypeArg" }
 }
 
-impl From<trap::Label<SlicePat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<SlicePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of AstNode
+impl From<trap::Label<AssocTypeArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<AssocTypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SlicePat>> for trap::Label<Element> {
-    fn from(value: trap::Label<SlicePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of Element
+impl From<trap::Label<AssocTypeArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<AssocTypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SlicePat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<SlicePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of Locatable
+impl From<trap::Label<AssocTypeArg>> for trap::Label<GenericArg> {
+    fn from(value: trap::Label<AssocTypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of GenericArg
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SlicePat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<SlicePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of Pat
+impl From<trap::Label<AssocTypeArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<AssocTypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AssocTypeArg is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3370,62 +3313,62 @@ impl From<trap::Label<SlicePat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct TupleExpr {
-    pub id: trap::TrapId<TupleExpr>,
-    pub exprs: Vec<trap::Label<Expr>>,
-    pub is_assignee_expr: bool,
+pub struct AwaitExpr {
+    pub id: trap::TrapId<AwaitExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for TupleExpr {
+impl trap::TrapEntry for AwaitExpr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("tuple_exprs", vec![id.into()]);
-        for (i, v) in self.exprs.into_iter().enumerate() {
-            out.add_tuple("tuple_expr_exprs", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("await_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("await_expr_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if self.is_assignee_expr {
-            out.add_tuple("tuple_expr_is_assignee_expr", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("await_expr_exprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for TupleExpr {
-    fn class_name() -> &'static str { "TupleExpr" }
+impl trap::TrapClass for AwaitExpr {
+    fn class_name() -> &'static str { "AwaitExpr" }
 }
 
-impl From<trap::Label<TupleExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<TupleExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of AstNode
+impl From<trap::Label<AwaitExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<AwaitExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<TupleExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Element
+impl From<trap::Label<AwaitExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<AwaitExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<TupleExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Expr
+impl From<trap::Label<AwaitExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<AwaitExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TupleExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Locatable
+impl From<trap::Label<AwaitExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<AwaitExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AwaitExpr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3433,129 +3376,5238 @@ impl From<trap::Label<TupleExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct TuplePat {
-    pub id: trap::TrapId<TuplePat>,
-    pub args: Vec<trap::Label<Pat>>,
-    pub ellipsis_index: Option<usize>,
+pub struct BecomeExpr {
+    pub id: trap::TrapId<BecomeExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
 }
 
-impl trap::TrapEntry for TuplePat {
+impl trap::TrapEntry for BecomeExpr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("tuple_pats", vec![id.into()]);
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("tuple_pat_args", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("become_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("become_expr_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.ellipsis_index {
-            out.add_tuple("tuple_pat_ellipsis_indices", vec![id.into(), v.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("become_expr_exprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for TuplePat {
-    fn class_name() -> &'static str { "TuplePat" }
+impl trap::TrapClass for BecomeExpr {
+    fn class_name() -> &'static str { "BecomeExpr" }
 }
 
-impl From<trap::Label<TuplePat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<TuplePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of AstNode
+impl From<trap::Label<BecomeExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<BecomeExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TuplePat>> for trap::Label<Element> {
-    fn from(value: trap::Label<TuplePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of Element
+impl From<trap::Label<BecomeExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<BecomeExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TuplePat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TuplePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of Locatable
+impl From<trap::Label<BecomeExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<BecomeExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TuplePat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<TuplePat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of Pat
-        unsafe {
-            Self::from_untyped(value.as_untyped())
+impl From<trap::Label<BecomeExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<BecomeExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BecomeExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct BinaryExpr {
+    pub id: trap::TrapId<BinaryExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub lhs: Option<trap::Label<Expr>>,
+    pub rhs: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for BinaryExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("binary_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("binary_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.lhs {
+            out.add_tuple("binary_expr_lhs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.rhs {
+            out.add_tuple("binary_expr_rhs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for BinaryExpr {
+    fn class_name() -> &'static str { "BinaryExpr" }
+}
+
+impl From<trap::Label<BinaryExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<BinaryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BinaryExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<BinaryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BinaryExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<BinaryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BinaryExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<BinaryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BinaryExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct BlockExpr {
+    pub id: trap::TrapId<BlockExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub label: Option<trap::Label<Label>>,
+    pub stmt_list: Option<trap::Label<StmtList>>,
+}
+
+impl trap::TrapEntry for BlockExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("block_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("block_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.label {
+            out.add_tuple("block_expr_labels", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.stmt_list {
+            out.add_tuple("block_expr_stmt_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for BlockExpr {
+    fn class_name() -> &'static str { "BlockExpr" }
+}
+
+impl From<trap::Label<BlockExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BlockExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BlockExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BlockExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct BoxPat {
+    pub id: trap::TrapId<BoxPat>,
+    pub pat: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for BoxPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("box_pats", vec![id.into()]);
+        if let Some(v) = self.pat {
+            out.add_tuple("box_pat_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for BoxPat {
+    fn class_name() -> &'static str { "BoxPat" }
+}
+
+impl From<trap::Label<BoxPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<BoxPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BoxPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<BoxPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BoxPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<BoxPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BoxPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<BoxPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BoxPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct BreakExpr {
+    pub id: trap::TrapId<BreakExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+}
+
+impl trap::TrapEntry for BreakExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("break_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("break_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("break_expr_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("break_expr_lifetimes", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for BreakExpr {
+    fn class_name() -> &'static str { "BreakExpr" }
+}
+
+impl From<trap::Label<BreakExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<BreakExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BreakExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<BreakExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BreakExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<BreakExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BreakExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<BreakExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BreakExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct CallExpr {
+    pub id: trap::TrapId<CallExpr>,
+    pub arg_list: Option<trap::Label<ArgList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for CallExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("call_exprs", vec![id.into()]);
+        if let Some(v) = self.arg_list {
+            out.add_tuple("call_expr_arg_lists", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("call_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("call_expr_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for CallExpr {
+    fn class_name() -> &'static str { "CallExpr" }
+}
+
+impl From<trap::Label<CallExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CallExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CallExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CallExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CallExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct CastExpr {
+    pub id: trap::TrapId<CastExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub ty: Option<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for CastExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("cast_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("cast_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("cast_expr_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("cast_expr_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for CastExpr {
+    fn class_name() -> &'static str { "CastExpr" }
+}
+
+impl From<trap::Label<CastExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<CastExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CastExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<CastExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CastExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<CastExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<CastExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<CastExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme CastExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ClosureExpr {
+    pub id: trap::TrapId<ClosureExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub body: Option<trap::Label<Expr>>,
+    pub closure_binder: Option<trap::Label<ClosureBinder>>,
+    pub param_list: Option<trap::Label<ParamList>>,
+    pub ret_type: Option<trap::Label<RetType>>,
+}
+
+impl trap::TrapEntry for ClosureExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("closure_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("closure_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.body {
+            out.add_tuple("closure_expr_bodies", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.closure_binder {
+            out.add_tuple("closure_expr_closure_binders", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.param_list {
+            out.add_tuple("closure_expr_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ret_type {
+            out.add_tuple("closure_expr_ret_types", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ClosureExpr {
+    fn class_name() -> &'static str { "ClosureExpr" }
+}
+
+impl From<trap::Label<ClosureExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ClosureExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ClosureExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ClosureExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ClosureExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<ClosureExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ClosureExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ClosureExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ClosureExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ConstArg {
+    pub id: trap::TrapId<ConstArg>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for ConstArg {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("const_args", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("const_arg_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ConstArg {
+    fn class_name() -> &'static str { "ConstArg" }
+}
+
+impl From<trap::Label<ConstArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ConstArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<ConstArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstArg>> for trap::Label<GenericArg> {
+    fn from(value: trap::Label<ConstArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of GenericArg
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ConstArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstArg is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ConstBlockPat {
+    pub id: trap::TrapId<ConstBlockPat>,
+    pub block_expr: Option<trap::Label<BlockExpr>>,
+}
+
+impl trap::TrapEntry for ConstBlockPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("const_block_pats", vec![id.into()]);
+        if let Some(v) = self.block_expr {
+            out.add_tuple("const_block_pat_block_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ConstBlockPat {
+    fn class_name() -> &'static str { "ConstBlockPat" }
+}
+
+impl From<trap::Label<ConstBlockPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ConstBlockPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstBlockPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<ConstBlockPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstBlockPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ConstBlockPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstBlockPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<ConstBlockPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstBlockPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ConstParam {
+    pub id: trap::TrapId<ConstParam>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub default_val: Option<trap::Label<ConstArg>>,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for ConstParam {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("const_params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("const_param_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.default_val {
+            out.add_tuple("const_param_default_vals", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("const_param_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("const_param_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ConstParam {
+    fn class_name() -> &'static str { "ConstParam" }
+}
+
+impl From<trap::Label<ConstParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstParam>> for trap::Label<GenericParam> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of GenericParam
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ConstParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ConstParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ConstParam is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ContinueExpr {
+    pub id: trap::TrapId<ContinueExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+}
+
+impl trap::TrapEntry for ContinueExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("continue_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("continue_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("continue_expr_lifetimes", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ContinueExpr {
+    fn class_name() -> &'static str { "ContinueExpr" }
+}
+
+impl From<trap::Label<ContinueExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ContinueExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ContinueExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ContinueExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ContinueExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<ContinueExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ContinueExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ContinueExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ContinueExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct DynTraitType {
+    pub id: trap::TrapId<DynTraitType>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+}
+
+impl trap::TrapEntry for DynTraitType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("dyn_trait_types", vec![id.into()]);
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("dyn_trait_type_type_bound_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for DynTraitType {
+    fn class_name() -> &'static str { "DynTraitType" }
+}
+
+impl From<trap::Label<DynTraitType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<DynTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<DynTraitType>> for trap::Label<Element> {
+    fn from(value: trap::Label<DynTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<DynTraitType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<DynTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<DynTraitType>> for trap::Label<Type> {
+    fn from(value: trap::Label<DynTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ExprStmt {
+    pub id: trap::TrapId<ExprStmt>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for ExprStmt {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("expr_stmts", vec![id.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("expr_stmt_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ExprStmt {
+    fn class_name() -> &'static str { "ExprStmt" }
+}
+
+impl From<trap::Label<ExprStmt>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ExprStmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExprStmt>> for trap::Label<Element> {
+    fn from(value: trap::Label<ExprStmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExprStmt>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ExprStmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExprStmt>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<ExprStmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExprStmt is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct FieldExpr {
+    pub id: trap::TrapId<FieldExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+}
+
+impl trap::TrapEntry for FieldExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("field_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("field_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("field_expr_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("field_expr_name_refs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for FieldExpr {
+    fn class_name() -> &'static str { "FieldExpr" }
+}
+
+impl From<trap::Label<FieldExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FieldExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FieldExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<FieldExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FieldExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<FieldExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FieldExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FieldExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FieldExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct FnPtrType {
+    pub id: trap::TrapId<FnPtrType>,
+    pub abi: Option<trap::Label<Abi>>,
+    pub param_list: Option<trap::Label<ParamList>>,
+    pub ret_type: Option<trap::Label<RetType>>,
+}
+
+impl trap::TrapEntry for FnPtrType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("fn_ptr_types", vec![id.into()]);
+        if let Some(v) = self.abi {
+            out.add_tuple("fn_ptr_type_abis", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.param_list {
+            out.add_tuple("fn_ptr_type_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ret_type {
+            out.add_tuple("fn_ptr_type_ret_types", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for FnPtrType {
+    fn class_name() -> &'static str { "FnPtrType" }
+}
+
+impl From<trap::Label<FnPtrType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FnPtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FnPtrType>> for trap::Label<Element> {
+    fn from(value: trap::Label<FnPtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FnPtrType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FnPtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FnPtrType>> for trap::Label<Type> {
+    fn from(value: trap::Label<FnPtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ForExpr {
+    pub id: trap::TrapId<ForExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub iterable: Option<trap::Label<Expr>>,
+    pub label: Option<trap::Label<Label>>,
+    pub loop_body: Option<trap::Label<BlockExpr>>,
+    pub pat: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for ForExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("for_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("for_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.iterable {
+            out.add_tuple("for_expr_iterables", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.label {
+            out.add_tuple("for_expr_labels", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.loop_body {
+            out.add_tuple("for_expr_loop_bodies", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("for_expr_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ForExpr {
+    fn class_name() -> &'static str { "ForExpr" }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ForType {
+    pub id: trap::TrapId<ForType>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub ty: Option<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for ForType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("for_types", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("for_type_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("for_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ForType {
+    fn class_name() -> &'static str { "ForType" }
+}
+
+impl From<trap::Label<ForType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ForType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForType>> for trap::Label<Element> {
+    fn from(value: trap::Label<ForType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ForType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForType>> for trap::Label<Type> {
+    fn from(value: trap::Label<ForType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct FormatArgsExpr {
+    pub id: trap::TrapId<FormatArgsExpr>,
+    pub args: Vec<trap::Label<FormatArgsArg>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub template: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for FormatArgsExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("format_args_exprs", vec![id.into()]);
+        for (i, v) in self.args.into_iter().enumerate() {
+            out.add_tuple("format_args_expr_args", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("format_args_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.template {
+            out.add_tuple("format_args_expr_templates", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for FormatArgsExpr {
+    fn class_name() -> &'static str { "FormatArgsExpr" }
+}
+
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FormatArgsExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<FormatArgsExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<FormatArgsExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<FormatArgsExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FormatArgsExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FormatArgsExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct IdentPat {
+    pub id: trap::TrapId<IdentPat>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub name: Option<trap::Label<Name>>,
+    pub pat: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for IdentPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("ident_pats", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("ident_pat_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("ident_pat_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("ident_pat_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for IdentPat {
+    fn class_name() -> &'static str { "IdentPat" }
+}
+
+impl From<trap::Label<IdentPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<IdentPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IdentPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<IdentPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IdentPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<IdentPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IdentPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<IdentPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IdentPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct IfExpr {
+    pub id: trap::TrapId<IfExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub condition: Option<trap::Label<Expr>>,
+    pub else_branch: Option<trap::Label<Expr>>,
+    pub then_branch: Option<trap::Label<BlockExpr>>,
+}
+
+impl trap::TrapEntry for IfExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("if_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("if_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.condition {
+            out.add_tuple("if_expr_conditions", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.else_branch {
+            out.add_tuple("if_expr_else_branches", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.then_branch {
+            out.add_tuple("if_expr_then_branches", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for IfExpr {
+    fn class_name() -> &'static str { "IfExpr" }
+}
+
+impl From<trap::Label<IfExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<IfExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IfExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<IfExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IfExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<IfExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IfExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<IfExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IfExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ImplTraitType {
+    pub id: trap::TrapId<ImplTraitType>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+}
+
+impl trap::TrapEntry for ImplTraitType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("impl_trait_types", vec![id.into()]);
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("impl_trait_type_type_bound_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ImplTraitType {
+    fn class_name() -> &'static str { "ImplTraitType" }
+}
+
+impl From<trap::Label<ImplTraitType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ImplTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ImplTraitType>> for trap::Label<Element> {
+    fn from(value: trap::Label<ImplTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ImplTraitType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ImplTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ImplTraitType>> for trap::Label<Type> {
+    fn from(value: trap::Label<ImplTraitType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct IndexExpr {
+    pub id: trap::TrapId<IndexExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub base: Option<trap::Label<Expr>>,
+    pub index: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for IndexExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("index_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("index_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.base {
+            out.add_tuple("index_expr_bases", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.index {
+            out.add_tuple("index_expr_indices", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for IndexExpr {
+    fn class_name() -> &'static str { "IndexExpr" }
+}
+
+impl From<trap::Label<IndexExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<IndexExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IndexExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<IndexExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IndexExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<IndexExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<IndexExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<IndexExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme IndexExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct InferType {
+    pub id: trap::TrapId<InferType>,
+}
+
+impl trap::TrapEntry for InferType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("infer_types", vec![id.into()]);
+    }
+}
+
+impl trap::TrapClass for InferType {
+    fn class_name() -> &'static str { "InferType" }
+}
+
+impl From<trap::Label<InferType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<InferType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<InferType>> for trap::Label<Element> {
+    fn from(value: trap::Label<InferType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<InferType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<InferType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<InferType>> for trap::Label<Type> {
+    fn from(value: trap::Label<InferType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Item {
+    _unused: ()
+}
+
+impl trap::TrapClass for Item {
+    fn class_name() -> &'static str { "Item" }
+}
+
+impl From<trap::Label<Item>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Item>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Item>> for trap::Label<Element> {
+    fn from(value: trap::Label<Item>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Item>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Item>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Item>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Item>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct LetExpr {
+    pub id: trap::TrapId<LetExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub pat: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for LetExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("let_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("let_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("let_expr_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("let_expr_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for LetExpr {
+    fn class_name() -> &'static str { "LetExpr" }
+}
+
+impl From<trap::Label<LetExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LetExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LetExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<LetExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LetExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<LetExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LetExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LetExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct LetStmt {
+    pub id: trap::TrapId<LetStmt>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub initializer: Option<trap::Label<Expr>>,
+    pub let_else: Option<trap::Label<LetElse>>,
+    pub pat: Option<trap::Label<Pat>>,
+    pub ty: Option<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for LetStmt {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("let_stmts", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("let_stmt_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.initializer {
+            out.add_tuple("let_stmt_initializers", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.let_else {
+            out.add_tuple("let_stmt_let_elses", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("let_stmt_pats", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("let_stmt_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for LetStmt {
+    fn class_name() -> &'static str { "LetStmt" }
+}
+
+impl From<trap::Label<LetStmt>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LetStmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LetStmt>> for trap::Label<Element> {
+    fn from(value: trap::Label<LetStmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LetStmt>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LetStmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LetStmt>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<LetStmt>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LetStmt is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct LifetimeArg {
+    pub id: trap::TrapId<LifetimeArg>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+}
+
+impl trap::TrapEntry for LifetimeArg {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("lifetime_args", vec![id.into()]);
+        if let Some(v) = self.lifetime {
+            out.add_tuple("lifetime_arg_lifetimes", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for LifetimeArg {
+    fn class_name() -> &'static str { "LifetimeArg" }
+}
+
+impl From<trap::Label<LifetimeArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LifetimeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<LifetimeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeArg>> for trap::Label<GenericArg> {
+    fn from(value: trap::Label<LifetimeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of GenericArg
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LifetimeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeArg is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct LifetimeParam {
+    pub id: trap::TrapId<LifetimeParam>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+}
+
+impl trap::TrapEntry for LifetimeParam {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("lifetime_params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("lifetime_param_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("lifetime_param_lifetimes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("lifetime_param_type_bound_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for LifetimeParam {
+    fn class_name() -> &'static str { "LifetimeParam" }
+}
+
+impl From<trap::Label<LifetimeParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LifetimeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<LifetimeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeParam>> for trap::Label<GenericParam> {
+    fn from(value: trap::Label<LifetimeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of GenericParam
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LifetimeParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LifetimeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LifetimeParam is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Literal {
+    pub id: trap::TrapId<Literal>,
+    pub attrs: Vec<trap::Label<Attr>>,
+}
+
+impl trap::TrapEntry for Literal {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("literals", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("literal_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Literal {
+    fn class_name() -> &'static str { "Literal" }
+}
+
+impl From<trap::Label<Literal>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Literal>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Literal is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Literal>> for trap::Label<Element> {
+    fn from(value: trap::Label<Literal>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Literal is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Literal>> for trap::Label<Expr> {
+    fn from(value: trap::Label<Literal>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Literal is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Literal>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Literal>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Literal is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct LiteralPat {
+    pub id: trap::TrapId<LiteralPat>,
+    pub literal: Option<trap::Label<Literal>>,
+}
+
+impl trap::TrapEntry for LiteralPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("literal_pats", vec![id.into()]);
+        if let Some(v) = self.literal {
+            out.add_tuple("literal_pat_literals", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for LiteralPat {
+    fn class_name() -> &'static str { "LiteralPat" }
+}
+
+impl From<trap::Label<LiteralPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LiteralPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LiteralPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<LiteralPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LiteralPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LiteralPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LiteralPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<LiteralPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LiteralPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct LoopExpr {
+    pub id: trap::TrapId<LoopExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub label: Option<trap::Label<Label>>,
+    pub loop_body: Option<trap::Label<BlockExpr>>,
+}
+
+impl trap::TrapEntry for LoopExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("loop_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("loop_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.label {
+            out.add_tuple("loop_expr_labels", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.loop_body {
+            out.add_tuple("loop_expr_loop_bodies", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for LoopExpr {
+    fn class_name() -> &'static str { "LoopExpr" }
+}
+
+impl From<trap::Label<LoopExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LoopExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<LoopExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<LoopExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LoopExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroExpr {
+    pub id: trap::TrapId<MacroExpr>,
+    pub macro_call: Option<trap::Label<MacroCall>>,
+}
+
+impl trap::TrapEntry for MacroExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_exprs", vec![id.into()]);
+        if let Some(v) = self.macro_call {
+            out.add_tuple("macro_expr_macro_calls", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroExpr {
+    fn class_name() -> &'static str { "MacroExpr" }
+}
+
+impl From<trap::Label<MacroExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<MacroExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroPat {
+    pub id: trap::TrapId<MacroPat>,
+    pub macro_call: Option<trap::Label<MacroCall>>,
+}
+
+impl trap::TrapEntry for MacroPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_pats", vec![id.into()]);
+        if let Some(v) = self.macro_call {
+            out.add_tuple("macro_pat_macro_calls", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroPat {
+    fn class_name() -> &'static str { "MacroPat" }
+}
+
+impl From<trap::Label<MacroPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<MacroPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroType {
+    pub id: trap::TrapId<MacroType>,
+    pub macro_call: Option<trap::Label<MacroCall>>,
+}
+
+impl trap::TrapEntry for MacroType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_types", vec![id.into()]);
+        if let Some(v) = self.macro_call {
+            out.add_tuple("macro_type_macro_calls", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroType {
+    fn class_name() -> &'static str { "MacroType" }
+}
+
+impl From<trap::Label<MacroType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroType>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroType>> for trap::Label<Type> {
+    fn from(value: trap::Label<MacroType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MatchExpr {
+    pub id: trap::TrapId<MatchExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub match_arm_list: Option<trap::Label<MatchArmList>>,
+}
+
+impl trap::TrapEntry for MatchExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("match_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("match_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("match_expr_exprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.match_arm_list {
+            out.add_tuple("match_expr_match_arm_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MatchExpr {
+    fn class_name() -> &'static str { "MatchExpr" }
+}
+
+impl From<trap::Label<MatchExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MatchExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MatchExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<MatchExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MatchExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<MatchExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MatchExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MatchExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MatchExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MethodCallExpr {
+    pub id: trap::TrapId<MethodCallExpr>,
+    pub arg_list: Option<trap::Label<ArgList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_arg_list: Option<trap::Label<GenericArgList>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+    pub receiver: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for MethodCallExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("method_call_exprs", vec![id.into()]);
+        if let Some(v) = self.arg_list {
+            out.add_tuple("method_call_expr_arg_lists", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("method_call_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_arg_list {
+            out.add_tuple("method_call_expr_generic_arg_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("method_call_expr_name_refs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.receiver {
+            out.add_tuple("method_call_expr_receivers", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MethodCallExpr {
+    fn class_name() -> &'static str { "MethodCallExpr" }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MethodCallExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MethodCallExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct NeverType {
+    pub id: trap::TrapId<NeverType>,
+}
+
+impl trap::TrapEntry for NeverType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("never_types", vec![id.into()]);
+    }
+}
+
+impl trap::TrapClass for NeverType {
+    fn class_name() -> &'static str { "NeverType" }
+}
+
+impl From<trap::Label<NeverType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<NeverType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<NeverType>> for trap::Label<Element> {
+    fn from(value: trap::Label<NeverType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<NeverType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<NeverType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<NeverType>> for trap::Label<Type> {
+    fn from(value: trap::Label<NeverType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct OffsetOfExpr {
+    pub id: trap::TrapId<OffsetOfExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub fields: Vec<trap::Label<NameRef>>,
+    pub ty: Option<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for OffsetOfExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("offset_of_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("offset_of_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("offset_of_expr_fields", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("offset_of_expr_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for OffsetOfExpr {
+    fn class_name() -> &'static str { "OffsetOfExpr" }
+}
+
+impl From<trap::Label<OffsetOfExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<OffsetOfExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<OffsetOfExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<OffsetOfExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<OffsetOfExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<OffsetOfExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<OffsetOfExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<OffsetOfExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme OffsetOfExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct OrPat {
+    pub id: trap::TrapId<OrPat>,
+    pub pats: Vec<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for OrPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("or_pats", vec![id.into()]);
+        for (i, v) in self.pats.into_iter().enumerate() {
+            out.add_tuple("or_pat_pats", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for OrPat {
+    fn class_name() -> &'static str { "OrPat" }
+}
+
+impl From<trap::Label<OrPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<OrPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<OrPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<OrPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<OrPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<OrPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<OrPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<OrPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme OrPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ParenExpr {
+    pub id: trap::TrapId<ParenExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for ParenExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("paren_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("paren_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("paren_expr_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ParenExpr {
+    fn class_name() -> &'static str { "ParenExpr" }
+}
+
+impl From<trap::Label<ParenExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ParenExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ParenExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<ParenExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ParenExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ParenPat {
+    pub id: trap::TrapId<ParenPat>,
+    pub pat: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for ParenPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("paren_pats", vec![id.into()]);
+        if let Some(v) = self.pat {
+            out.add_tuple("paren_pat_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ParenPat {
+    fn class_name() -> &'static str { "ParenPat" }
+}
+
+impl From<trap::Label<ParenPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ParenPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<ParenPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ParenPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<ParenPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ParenType {
+    pub id: trap::TrapId<ParenType>,
+    pub ty: Option<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for ParenType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("paren_types", vec![id.into()]);
+        if let Some(v) = self.ty {
+            out.add_tuple("paren_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ParenType {
+    fn class_name() -> &'static str { "ParenType" }
+}
+
+impl From<trap::Label<ParenType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ParenType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenType>> for trap::Label<Element> {
+    fn from(value: trap::Label<ParenType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ParenType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ParenType>> for trap::Label<Type> {
+    fn from(value: trap::Label<ParenType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct PathExpr {
+    pub id: trap::TrapId<PathExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub path: Option<trap::Label<Path>>,
+}
+
+impl trap::TrapEntry for PathExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("path_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("path_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.path {
+            out.add_tuple("path_expr_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PathExpr {
+    fn class_name() -> &'static str { "PathExpr" }
+}
+
+impl From<trap::Label<PathExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<PathExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct PathPat {
+    pub id: trap::TrapId<PathPat>,
+    pub path: Option<trap::Label<Path>>,
+}
+
+impl trap::TrapEntry for PathPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("path_pats", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_pat_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PathPat {
+    fn class_name() -> &'static str { "PathPat" }
+}
+
+impl From<trap::Label<PathPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<PathPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct PathType {
+    pub id: trap::TrapId<PathType>,
+    pub path: Option<trap::Label<Path>>,
+}
+
+impl trap::TrapEntry for PathType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("path_types", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_type_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PathType {
+    fn class_name() -> &'static str { "PathType" }
+}
+
+impl From<trap::Label<PathType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathType>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathType>> for trap::Label<Type> {
+    fn from(value: trap::Label<PathType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct PrefixExpr {
+    pub id: trap::TrapId<PrefixExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for PrefixExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("prefix_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("prefix_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("prefix_expr_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PrefixExpr {
+    fn class_name() -> &'static str { "PrefixExpr" }
+}
+
+impl From<trap::Label<PrefixExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PrefixExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PrefixExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<PrefixExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PrefixExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<PrefixExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PrefixExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PrefixExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PrefixExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct PtrType {
+    pub id: trap::TrapId<PtrType>,
+    pub ty: Option<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for PtrType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("ptr_types", vec![id.into()]);
+        if let Some(v) = self.ty {
+            out.add_tuple("ptr_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PtrType {
+    fn class_name() -> &'static str { "PtrType" }
+}
+
+impl From<trap::Label<PtrType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PtrType>> for trap::Label<Element> {
+    fn from(value: trap::Label<PtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PtrType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PtrType>> for trap::Label<Type> {
+    fn from(value: trap::Label<PtrType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RangeExpr {
+    pub id: trap::TrapId<RangeExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub end: Option<trap::Label<Expr>>,
+    pub start: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for RangeExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("range_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("range_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.end {
+            out.add_tuple("range_expr_ends", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.start {
+            out.add_tuple("range_expr_starts", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RangeExpr {
+    fn class_name() -> &'static str { "RangeExpr" }
+}
+
+impl From<trap::Label<RangeExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RangeExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RangeExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<RangeExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RangeExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<RangeExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RangeExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RangeExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RangeExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RangePat {
+    pub id: trap::TrapId<RangePat>,
+    pub end: Option<trap::Label<Pat>>,
+    pub start: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for RangePat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("range_pats", vec![id.into()]);
+        if let Some(v) = self.end {
+            out.add_tuple("range_pat_ends", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.start {
+            out.add_tuple("range_pat_starts", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RangePat {
+    fn class_name() -> &'static str { "RangePat" }
+}
+
+impl From<trap::Label<RangePat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RangePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RangePat>> for trap::Label<Element> {
+    fn from(value: trap::Label<RangePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RangePat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RangePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RangePat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<RangePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RangePat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RecordExpr {
+    pub id: trap::TrapId<RecordExpr>,
+    pub path: Option<trap::Label<Path>>,
+    pub record_expr_field_list: Option<trap::Label<RecordExprFieldList>>,
+}
+
+impl trap::TrapEntry for RecordExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("record_exprs", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("record_expr_paths", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.record_expr_field_list {
+            out.add_tuple("record_expr_record_expr_field_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RecordExpr {
+    fn class_name() -> &'static str { "RecordExpr" }
+}
+
+impl From<trap::Label<RecordExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<RecordExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RecordFieldList {
+    pub id: trap::TrapId<RecordFieldList>,
+    pub fields: Vec<trap::Label<RecordField>>,
+}
+
+impl trap::TrapEntry for RecordFieldList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("record_field_lists", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("record_field_list_fields", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RecordFieldList {
+    fn class_name() -> &'static str { "RecordFieldList" }
+}
+
+impl From<trap::Label<RecordFieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordFieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordFieldList>> for trap::Label<FieldList> {
+    fn from(value: trap::Label<RecordFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of FieldList
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordFieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordFieldList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RecordPat {
+    pub id: trap::TrapId<RecordPat>,
+    pub path: Option<trap::Label<Path>>,
+    pub record_pat_field_list: Option<trap::Label<RecordPatFieldList>>,
+}
+
+impl trap::TrapEntry for RecordPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("record_pats", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("record_pat_paths", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.record_pat_field_list {
+            out.add_tuple("record_pat_record_pat_field_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RecordPat {
+    fn class_name() -> &'static str { "RecordPat" }
+}
+
+impl From<trap::Label<RecordPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RecordPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<RecordPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RecordPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RecordPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<RecordPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RecordPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RefExpr {
+    pub id: trap::TrapId<RefExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for RefExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("ref_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("ref_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("ref_expr_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RefExpr {
+    fn class_name() -> &'static str { "RefExpr" }
+}
+
+impl From<trap::Label<RefExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RefExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<RefExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<RefExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RefExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RefPat {
+    pub id: trap::TrapId<RefPat>,
+    pub pat: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for RefPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("ref_pats", vec![id.into()]);
+        if let Some(v) = self.pat {
+            out.add_tuple("ref_pat_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RefPat {
+    fn class_name() -> &'static str { "RefPat" }
+}
+
+impl From<trap::Label<RefPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RefPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<RefPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RefPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<RefPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RefType {
+    pub id: trap::TrapId<RefType>,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+    pub ty: Option<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for RefType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("ref_types", vec![id.into()]);
+        if let Some(v) = self.lifetime {
+            out.add_tuple("ref_type_lifetimes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("ref_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RefType {
+    fn class_name() -> &'static str { "RefType" }
+}
+
+impl From<trap::Label<RefType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RefType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefType>> for trap::Label<Element> {
+    fn from(value: trap::Label<RefType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RefType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RefType>> for trap::Label<Type> {
+    fn from(value: trap::Label<RefType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RestPat {
+    pub id: trap::TrapId<RestPat>,
+    pub attrs: Vec<trap::Label<Attr>>,
+}
+
+impl trap::TrapEntry for RestPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("rest_pats", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("rest_pat_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for RestPat {
+    fn class_name() -> &'static str { "RestPat" }
+}
+
+impl From<trap::Label<RestPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RestPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RestPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<RestPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RestPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RestPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<RestPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<RestPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RestPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ReturnExpr {
+    pub id: trap::TrapId<ReturnExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for ReturnExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("return_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("return_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("return_expr_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ReturnExpr {
+    fn class_name() -> &'static str { "ReturnExpr" }
+}
+
+impl From<trap::Label<ReturnExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ReturnExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ReturnExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ReturnExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ReturnExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<ReturnExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ReturnExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ReturnExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ReturnExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct SlicePat {
+    pub id: trap::TrapId<SlicePat>,
+    pub pats: Vec<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for SlicePat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("slice_pats", vec![id.into()]);
+        for (i, v) in self.pats.into_iter().enumerate() {
+            out.add_tuple("slice_pat_pats", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for SlicePat {
+    fn class_name() -> &'static str { "SlicePat" }
+}
+
+impl From<trap::Label<SlicePat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<SlicePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SlicePat>> for trap::Label<Element> {
+    fn from(value: trap::Label<SlicePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SlicePat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<SlicePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SlicePat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<SlicePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SlicePat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct SliceType {
+    pub id: trap::TrapId<SliceType>,
+    pub ty: Option<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for SliceType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("slice_types", vec![id.into()]);
+        if let Some(v) = self.ty {
+            out.add_tuple("slice_type_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for SliceType {
+    fn class_name() -> &'static str { "SliceType" }
+}
+
+impl From<trap::Label<SliceType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<SliceType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SliceType>> for trap::Label<Element> {
+    fn from(value: trap::Label<SliceType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SliceType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<SliceType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SliceType>> for trap::Label<Type> {
+    fn from(value: trap::Label<SliceType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TryExpr {
+    pub id: trap::TrapId<TryExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for TryExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("try_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("try_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("try_expr_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TryExpr {
+    fn class_name() -> &'static str { "TryExpr" }
+}
+
+impl From<trap::Label<TryExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TryExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<TryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TryExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<TryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TryExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TryExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TryExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TupleExpr {
+    pub id: trap::TrapId<TupleExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub fields: Vec<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for TupleExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("tuple_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("tuple_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_expr_fields", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TupleExpr {
+    fn class_name() -> &'static str { "TupleExpr" }
+}
+
+impl From<trap::Label<TupleExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<TupleExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TupleFieldList {
+    pub id: trap::TrapId<TupleFieldList>,
+    pub fields: Vec<trap::Label<TupleField>>,
+}
+
+impl trap::TrapEntry for TupleFieldList {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("tuple_field_lists", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_field_list_fields", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TupleFieldList {
+    fn class_name() -> &'static str { "TupleFieldList" }
+}
+
+impl From<trap::Label<TupleFieldList>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleFieldList>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleFieldList>> for trap::Label<FieldList> {
+    fn from(value: trap::Label<TupleFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of FieldList
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleFieldList>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleFieldList>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleFieldList is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TuplePat {
+    pub id: trap::TrapId<TuplePat>,
+    pub fields: Vec<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for TuplePat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("tuple_pats", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_pat_fields", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TuplePat {
+    fn class_name() -> &'static str { "TuplePat" }
+}
+
+impl From<trap::Label<TuplePat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TuplePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TuplePat>> for trap::Label<Element> {
+    fn from(value: trap::Label<TuplePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TuplePat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TuplePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TuplePat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<TuplePat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TuplePat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TupleStructPat {
+    pub id: trap::TrapId<TupleStructPat>,
+    pub fields: Vec<trap::Label<Pat>>,
+    pub path: Option<trap::Label<Path>>,
+}
+
+impl trap::TrapEntry for TupleStructPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("tuple_struct_pats", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_struct_pat_fields", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.path {
+            out.add_tuple("tuple_struct_pat_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TupleStructPat {
+    fn class_name() -> &'static str { "TupleStructPat" }
+}
+
+impl From<trap::Label<TupleStructPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleStructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleStructPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleStructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleStructPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleStructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleStructPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<TupleStructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TupleType {
+    pub id: trap::TrapId<TupleType>,
+    pub fields: Vec<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for TupleType {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("tuple_types", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_type_fields", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TupleType {
+    fn class_name() -> &'static str { "TupleType" }
+}
+
+impl From<trap::Label<TupleType>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleType>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleType>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleType>> for trap::Label<Type> {
+    fn from(value: trap::Label<TupleType>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of Type
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TypeArg {
+    pub id: trap::TrapId<TypeArg>,
+    pub ty: Option<trap::Label<Type>>,
+}
+
+impl trap::TrapEntry for TypeArg {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("type_args", vec![id.into()]);
+        if let Some(v) = self.ty {
+            out.add_tuple("type_arg_ties", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TypeArg {
+    fn class_name() -> &'static str { "TypeArg" }
+}
+
+impl From<trap::Label<TypeArg>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeArg>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeArg>> for trap::Label<GenericArg> {
+    fn from(value: trap::Label<TypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of GenericArg
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeArg>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeArg>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeArg is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TypeParam {
+    pub id: trap::TrapId<TypeParam>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub default_type: Option<trap::Label<Type>>,
+    pub name: Option<trap::Label<Name>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+}
+
+impl trap::TrapEntry for TypeParam {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("type_params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("type_param_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.default_type {
+            out.add_tuple("type_param_default_types", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("type_param_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("type_param_type_bound_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TypeParam {
+    fn class_name() -> &'static str { "TypeParam" }
+}
+
+impl From<trap::Label<TypeParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeParam>> for trap::Label<GenericParam> {
+    fn from(value: trap::Label<TypeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of GenericParam
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TypeParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeParam is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct UnderscoreExpr {
+    pub id: trap::TrapId<UnderscoreExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+}
+
+impl trap::TrapEntry for UnderscoreExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("underscore_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("underscore_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for UnderscoreExpr {
+    fn class_name() -> &'static str { "UnderscoreExpr" }
+}
+
+impl From<trap::Label<UnderscoreExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<UnderscoreExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<UnderscoreExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<UnderscoreExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<UnderscoreExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<UnderscoreExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<UnderscoreExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<UnderscoreExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct WhileExpr {
+    pub id: trap::TrapId<WhileExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub condition: Option<trap::Label<Expr>>,
+    pub label: Option<trap::Label<Label>>,
+    pub loop_body: Option<trap::Label<BlockExpr>>,
+}
+
+impl trap::TrapEntry for WhileExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("while_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("while_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.condition {
+            out.add_tuple("while_expr_conditions", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.label {
+            out.add_tuple("while_expr_labels", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.loop_body {
+            out.add_tuple("while_expr_loop_bodies", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for WhileExpr {
+    fn class_name() -> &'static str { "WhileExpr" }
+}
+
+impl From<trap::Label<WhileExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WhileExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WhileExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WhileExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct WildcardPat {
+    pub id: trap::TrapId<WildcardPat>,
+}
+
+impl trap::TrapEntry for WildcardPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("wildcard_pats", vec![id.into()]);
+    }
+}
+
+impl trap::TrapClass for WildcardPat {
+    fn class_name() -> &'static str { "WildcardPat" }
+}
+
+impl From<trap::Label<WildcardPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<WildcardPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WildcardPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<WildcardPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WildcardPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<WildcardPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WildcardPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<WildcardPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct YeetExpr {
+    pub id: trap::TrapId<YeetExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for YeetExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("yeet_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("yeet_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("yeet_expr_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for YeetExpr {
+    fn class_name() -> &'static str { "YeetExpr" }
+}
+
+impl From<trap::Label<YeetExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<YeetExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<YeetExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<YeetExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<YeetExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<YeetExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<YeetExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<YeetExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct YieldExpr {
+    pub id: trap::TrapId<YieldExpr>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub expr: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for YieldExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("yield_exprs", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("yield_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.expr {
+            out.add_tuple("yield_expr_exprs", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for YieldExpr {
+    fn class_name() -> &'static str { "YieldExpr" }
+}
+
+impl From<trap::Label<YieldExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<YieldExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<YieldExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<YieldExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<YieldExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<YieldExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<YieldExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<YieldExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Const {
+    pub id: trap::TrapId<Const>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub body: Option<trap::Label<Expr>>,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<Type>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+}
+
+impl trap::TrapEntry for Const {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("consts", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("const_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.body {
+            out.add_tuple("const_bodies", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("const_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("const_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("const_visibilities", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Const {
+    fn class_name() -> &'static str { "Const" }
+}
+
+impl From<trap::Label<Const>> for trap::Label<AssocItem> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of AssocItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Const>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Const>> for trap::Label<Element> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Const>> for trap::Label<Item> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Const>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Const>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Enum {
+    pub id: trap::TrapId<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>>,
+}
+
+impl trap::TrapEntry for Enum {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    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()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("enum_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()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("enum_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("enum_where_clauses", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Enum {
+    fn class_name() -> &'static str { "Enum" }
+}
+
+impl From<trap::Label<Enum>> for trap::Label<Adt> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Adt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Enum>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Enum>> for trap::Label<Element> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Enum>> for trap::Label<Item> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Enum>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Enum>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
         }
     }
 }
 
 #[derive(Debug)]
-pub struct TupleStructPat {
-    pub id: trap::TrapId<TupleStructPat>,
+pub struct ExternBlock {
+    pub id: trap::TrapId<ExternBlock>,
+    pub abi: Option<trap::Label<Abi>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub extern_item_list: Option<trap::Label<ExternItemList>>,
+}
+
+impl trap::TrapEntry for ExternBlock {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("extern_blocks", vec![id.into()]);
+        if let Some(v) = self.abi {
+            out.add_tuple("extern_block_abis", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("extern_block_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.extern_item_list {
+            out.add_tuple("extern_block_extern_item_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ExternBlock {
+    fn class_name() -> &'static str { "ExternBlock" }
+}
+
+impl From<trap::Label<ExternBlock>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ExternBlock>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternBlock>> for trap::Label<Element> {
+    fn from(value: trap::Label<ExternBlock>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternBlock>> for trap::Label<Item> {
+    fn from(value: trap::Label<ExternBlock>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternBlock>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ExternBlock>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternBlock>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<ExternBlock>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ExternCrate {
+    pub id: trap::TrapId<ExternCrate>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub name_ref: Option<trap::Label<NameRef>>,
+    pub rename: Option<trap::Label<Rename>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+}
+
+impl trap::TrapEntry for ExternCrate {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("extern_crates", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("extern_crate_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.name_ref {
+            out.add_tuple("extern_crate_name_refs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.rename {
+            out.add_tuple("extern_crate_renames", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("extern_crate_visibilities", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ExternCrate {
+    fn class_name() -> &'static str { "ExternCrate" }
+}
+
+impl From<trap::Label<ExternCrate>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ExternCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternCrate>> for trap::Label<Element> {
+    fn from(value: trap::Label<ExternCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternCrate>> for trap::Label<Item> {
+    fn from(value: trap::Label<ExternCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternCrate>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ExternCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ExternCrate>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<ExternCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Fn {
+    pub id: trap::TrapId<Fn>,
+    pub abi: Option<trap::Label<Abi>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub body: Option<trap::Label<BlockExpr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub param_list: Option<trap::Label<ParamList>>,
+    pub ret_type: Option<trap::Label<RetType>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
+}
+
+impl trap::TrapEntry for Fn {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("fns", vec![id.into()]);
+        if let Some(v) = self.abi {
+            out.add_tuple("fn_abis", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("fn_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.body {
+            out.add_tuple("fn_bodies", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("fn_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("fn_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.param_list {
+            out.add_tuple("fn_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ret_type {
+            out.add_tuple("fn_ret_types", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("fn_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("fn_where_clauses", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Fn {
+    fn class_name() -> &'static str { "Fn" }
+}
+
+impl From<trap::Label<Fn>> for trap::Label<AssocItem> {
+    fn from(value: trap::Label<Fn>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Fn is a subclass of AssocItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Fn>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Fn>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Fn is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Fn>> for trap::Label<Element> {
+    fn from(value: trap::Label<Fn>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Fn is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Fn>> for trap::Label<ExternItem> {
+    fn from(value: trap::Label<Fn>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Fn is a subclass of ExternItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Fn>> for trap::Label<Item> {
+    fn from(value: trap::Label<Fn>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Fn is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Fn>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Fn>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Fn is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Fn>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Fn>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Fn is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Impl {
+    pub id: trap::TrapId<Impl>,
+    pub assoc_item_list: Option<trap::Label<AssocItemList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub self_ty: Option<trap::Label<Type>>,
+    pub trait_: Option<trap::Label<Type>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
+}
+
+impl trap::TrapEntry for Impl {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("impls", vec![id.into()]);
+        if let Some(v) = self.assoc_item_list {
+            out.add_tuple("impl_assoc_item_lists", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("impl_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("impl_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.self_ty {
+            out.add_tuple("impl_self_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.trait_ {
+            out.add_tuple("impl_traits", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("impl_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("impl_where_clauses", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Impl {
+    fn class_name() -> &'static str { "Impl" }
+}
+
+impl From<trap::Label<Impl>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Impl>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Impl>> for trap::Label<Element> {
+    fn from(value: trap::Label<Impl>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Impl>> for trap::Label<Item> {
+    fn from(value: trap::Label<Impl>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Impl>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Impl>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Impl>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Impl>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct MacroCall {
+    pub id: trap::TrapId<MacroCall>,
+    pub attrs: Vec<trap::Label<Attr>>,
     pub path: Option<trap::Label<Path>>,
-    pub args: Vec<trap::Label<Pat>>,
-    pub ellipsis_index: Option<usize>,
+    pub token_tree: Option<trap::Label<TokenTree>>,
 }
 
-impl trap::TrapEntry for TupleStructPat {
+impl trap::TrapEntry for MacroCall {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("tuple_struct_pats", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("tuple_struct_pat_paths", vec![id.into(), v.into()]);
-        }
-        for (i, v) in self.args.into_iter().enumerate() {
-            out.add_tuple("tuple_struct_pat_args", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.ellipsis_index {
-            out.add_tuple("tuple_struct_pat_ellipsis_indices", vec![id.into(), v.into()]);
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("macro_calls", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("macro_call_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.path {
+            out.add_tuple("macro_call_paths", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.token_tree {
+            out.add_tuple("macro_call_token_trees", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for MacroCall {
+    fn class_name() -> &'static str { "MacroCall" }
+}
+
+impl From<trap::Label<MacroCall>> for trap::Label<AssocItem> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of AssocItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroCall>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl trap::TrapClass for TupleStructPat {
-    fn class_name() -> &'static str { "TupleStructPat" }
+impl From<trap::Label<MacroCall>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
 }
 
-impl From<trap::Label<TupleStructPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of AstNode
+impl From<trap::Label<MacroCall>> for trap::Label<ExternItem> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of ExternItem
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleStructPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Element
+impl From<trap::Label<MacroCall>> for trap::Label<Item> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleStructPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Locatable
+impl From<trap::Label<MacroCall>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleStructPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Pat
+impl From<trap::Label<MacroCall>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3563,54 +8615,83 @@ impl From<trap::Label<TupleStructPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct UnderscoreExpr {
-    pub id: trap::TrapId<UnderscoreExpr>,
+pub struct MacroDef {
+    pub id: trap::TrapId<MacroDef>,
+    pub args: Option<trap::Label<TokenTree>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub body: Option<trap::Label<TokenTree>>,
+    pub name: Option<trap::Label<Name>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for UnderscoreExpr {
+impl trap::TrapEntry for MacroDef {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("underscore_exprs", vec![id.into()]);
+        out.add_tuple("macro_defs", vec![id.into()]);
+        if let Some(v) = self.args {
+            out.add_tuple("macro_def_args", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("macro_def_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.body {
+            out.add_tuple("macro_def_bodies", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("macro_def_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("macro_def_visibilities", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for UnderscoreExpr {
-    fn class_name() -> &'static str { "UnderscoreExpr" }
+impl trap::TrapClass for MacroDef {
+    fn class_name() -> &'static str { "MacroDef" }
 }
 
-impl From<trap::Label<UnderscoreExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<UnderscoreExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of AstNode
+impl From<trap::Label<MacroDef>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnderscoreExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<UnderscoreExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Element
+impl From<trap::Label<MacroDef>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnderscoreExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<UnderscoreExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Expr
+impl From<trap::Label<MacroDef>> for trap::Label<Item> {
+    fn from(value: trap::Label<MacroDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnderscoreExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<UnderscoreExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnderscoreExpr is a subclass of Locatable
+impl From<trap::Label<MacroDef>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<MacroDef>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<MacroDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3618,72 +8699,79 @@ impl From<trap::Label<UnderscoreExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct UnimplementedDeclaration {
-    pub id: trap::TrapId<UnimplementedDeclaration>,
+pub struct MacroRules {
+    pub id: trap::TrapId<MacroRules>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub name: Option<trap::Label<Name>>,
+    pub token_tree: Option<trap::Label<TokenTree>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for UnimplementedDeclaration {
+impl trap::TrapEntry for MacroRules {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("unimplemented_declarations", vec![id.into()]);
+        out.add_tuple("macro_rules", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("macro_rules_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("macro_rules_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.token_tree {
+            out.add_tuple("macro_rules_token_trees", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("macro_rules_visibilities", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for UnimplementedDeclaration {
-    fn class_name() -> &'static str { "UnimplementedDeclaration" }
-}
-
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
+impl trap::TrapClass for MacroRules {
+    fn class_name() -> &'static str { "MacroRules" }
 }
 
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<Declaration> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of Declaration
+impl From<trap::Label<MacroRules>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroRules>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<Element> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of Element
+impl From<trap::Label<MacroRules>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroRules>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of Locatable
+impl From<trap::Label<MacroRules>> for trap::Label<Item> {
+    fn from(value: trap::Label<MacroRules>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<Unextracted> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of Unextracted
+impl From<trap::Label<MacroRules>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroRules>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<Unimplemented> {
-    fn from(value: trap::Label<UnimplementedDeclaration>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnimplementedDeclaration is a subclass of Unimplemented
+impl From<trap::Label<MacroRules>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<MacroRules>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3691,54 +8779,79 @@ impl From<trap::Label<UnimplementedDeclaration>> for trap::Label<Unimplemented>
 }
 
 #[derive(Debug)]
-pub struct WildcardPat {
-    pub id: trap::TrapId<WildcardPat>,
+pub struct Module {
+    pub id: trap::TrapId<Module>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub item_list: Option<trap::Label<ItemList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for WildcardPat {
+impl trap::TrapEntry for Module {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("wildcard_pats", vec![id.into()]);
+        out.add_tuple("modules", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("module_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.item_list {
+            out.add_tuple("module_item_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("module_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("module_visibilities", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for WildcardPat {
-    fn class_name() -> &'static str { "WildcardPat" }
+impl trap::TrapClass for Module {
+    fn class_name() -> &'static str { "Module" }
 }
 
-impl From<trap::Label<WildcardPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<WildcardPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of AstNode
+impl From<trap::Label<Module>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Module>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<WildcardPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<WildcardPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of Element
+impl From<trap::Label<Module>> for trap::Label<Element> {
+    fn from(value: trap::Label<Module>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<WildcardPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<WildcardPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of Locatable
+impl From<trap::Label<Module>> for trap::Label<Item> {
+    fn from(value: trap::Label<Module>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<WildcardPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<WildcardPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WildcardPat is a subclass of Pat
+impl From<trap::Label<Module>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Module>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Module>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Module>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3746,58 +8859,92 @@ impl From<trap::Label<WildcardPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct YeetExpr {
-    pub id: trap::TrapId<YeetExpr>,
-    pub expr: Option<trap::Label<Expr>>,
+pub struct Static {
+    pub id: trap::TrapId<Static>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub body: Option<trap::Label<Expr>>,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<Type>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for YeetExpr {
+impl trap::TrapEntry for Static {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("yeet_exprs", vec![id.into()]);
-        if let Some(v) = self.expr {
-            out.add_tuple("yeet_expr_exprs", vec![id.into(), v.into()]);
+        out.add_tuple("statics", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("static_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.body {
+            out.add_tuple("static_bodies", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("static_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("static_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("static_visibilities", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for YeetExpr {
-    fn class_name() -> &'static str { "YeetExpr" }
+impl trap::TrapClass for Static {
+    fn class_name() -> &'static str { "Static" }
 }
 
-impl From<trap::Label<YeetExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<YeetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of AstNode
+impl From<trap::Label<Static>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YeetExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<YeetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Element
+impl From<trap::Label<Static>> for trap::Label<Element> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YeetExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<YeetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Expr
+impl From<trap::Label<Static>> for trap::Label<ExternItem> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of ExternItem
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YeetExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<YeetExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YeetExpr is a subclass of Locatable
+impl From<trap::Label<Static>> for trap::Label<Item> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Static>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Static>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3805,130 +8952,188 @@ impl From<trap::Label<YeetExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct YieldExpr {
-    pub id: trap::TrapId<YieldExpr>,
-    pub expr: Option<trap::Label<Expr>>,
+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>>,
 }
 
-impl trap::TrapEntry for YieldExpr {
+impl trap::TrapEntry for Struct {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("yield_exprs", vec![id.into()]);
-        if let Some(v) = self.expr {
-            out.add_tuple("yield_expr_exprs", vec![id.into(), v.into()]);
+        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()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("struct_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("struct_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("struct_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("struct_where_clauses", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for YieldExpr {
-    fn class_name() -> &'static str { "YieldExpr" }
+impl trap::TrapClass for Struct {
+    fn class_name() -> &'static str { "Struct" }
 }
 
-impl From<trap::Label<YieldExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<YieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of AstNode
+impl From<trap::Label<Struct>> for trap::Label<Adt> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Adt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YieldExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<YieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Element
+impl From<trap::Label<Struct>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YieldExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<YieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Expr
+impl From<trap::Label<Struct>> for trap::Label<Element> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<YieldExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<YieldExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme YieldExpr is a subclass of Locatable
+impl From<trap::Label<Struct>> for trap::Label<Item> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-#[derive(Debug)]
-pub struct AsyncBlockExpr {
-    pub id: trap::TrapId<AsyncBlockExpr>,
-    pub statements: Vec<trap::Label<Stmt>>,
-    pub tail: Option<trap::Label<Expr>>,
+impl From<trap::Label<Struct>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Struct>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
 }
 
-impl trap::TrapEntry for AsyncBlockExpr {
+#[derive(Debug)]
+pub struct Trait {
+    pub id: trap::TrapId<Trait>,
+    pub assoc_item_list: Option<trap::Label<AssocItemList>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
+}
+
+impl trap::TrapEntry for Trait {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("async_block_exprs", vec![id.into()]);
-        for (i, v) in self.statements.into_iter().enumerate() {
-            out.add_tuple("block_expr_base_statements", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("traits", vec![id.into()]);
+        if let Some(v) = self.assoc_item_list {
+            out.add_tuple("trait_assoc_item_lists", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("trait_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("trait_generic_param_lists", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.tail {
-            out.add_tuple("block_expr_base_tails", vec![id.into(), v.into()]);
+        if let Some(v) = self.name {
+            out.add_tuple("trait_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("trait_type_bound_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("trait_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("trait_where_clauses", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for AsyncBlockExpr {
-    fn class_name() -> &'static str { "AsyncBlockExpr" }
+impl trap::TrapClass for Trait {
+    fn class_name() -> &'static str { "Trait" }
 }
 
-impl From<trap::Label<AsyncBlockExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<AsyncBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsyncBlockExpr is a subclass of AstNode
+impl From<trap::Label<Trait>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Trait>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsyncBlockExpr>> for trap::Label<BlockExprBase> {
-    fn from(value: trap::Label<AsyncBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsyncBlockExpr is a subclass of BlockExprBase
+impl From<trap::Label<Trait>> for trap::Label<Element> {
+    fn from(value: trap::Label<Trait>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsyncBlockExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<AsyncBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsyncBlockExpr is a subclass of Element
+impl From<trap::Label<Trait>> for trap::Label<Item> {
+    fn from(value: trap::Label<Trait>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsyncBlockExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<AsyncBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsyncBlockExpr is a subclass of Expr
+impl From<trap::Label<Trait>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Trait>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<AsyncBlockExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<AsyncBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsyncBlockExpr is a subclass of Locatable
+impl From<trap::Label<Trait>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Trait>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3936,75 +9141,87 @@ impl From<trap::Label<AsyncBlockExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct BlockExpr {
-    pub id: trap::TrapId<BlockExpr>,
-    pub statements: Vec<trap::Label<Stmt>>,
-    pub tail: Option<trap::Label<Expr>>,
-    pub label: Option<trap::Label<Label>>,
+pub struct TraitAlias {
+    pub id: trap::TrapId<TraitAlias>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
 }
 
-impl trap::TrapEntry for BlockExpr {
+impl trap::TrapEntry for TraitAlias {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("block_exprs", vec![id.into()]);
-        for (i, v) in self.statements.into_iter().enumerate() {
-            out.add_tuple("block_expr_base_statements", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("trait_aliases", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("trait_alias_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.tail {
-            out.add_tuple("block_expr_base_tails", vec![id.into(), v.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("trait_alias_generic_param_lists", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.label {
-            out.add_tuple("block_expr_labels", vec![id.into(), v.into()]);
+        if let Some(v) = self.name {
+            out.add_tuple("trait_alias_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("trait_alias_type_bound_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("trait_alias_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("trait_alias_where_clauses", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for BlockExpr {
-    fn class_name() -> &'static str { "BlockExpr" }
+impl trap::TrapClass for TraitAlias {
+    fn class_name() -> &'static str { "TraitAlias" }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of AstNode
+impl From<trap::Label<TraitAlias>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TraitAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<BlockExprBase> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of BlockExprBase
+impl From<trap::Label<TraitAlias>> for trap::Label<Element> {
+    fn from(value: trap::Label<TraitAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Element
+impl From<trap::Label<TraitAlias>> for trap::Label<Item> {
+    fn from(value: trap::Label<TraitAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Expr
+impl From<trap::Label<TraitAlias>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TraitAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<BlockExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Locatable
+impl From<trap::Label<TraitAlias>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<TraitAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4012,71 +9229,109 @@ impl From<trap::Label<BlockExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ElementListExpr {
-    pub id: trap::TrapId<ElementListExpr>,
-    pub elements: Vec<trap::Label<Expr>>,
-    pub is_assignee_expr: bool,
-}
-
-impl trap::TrapEntry for ElementListExpr {
+pub struct TypeAlias {
+    pub id: trap::TrapId<TypeAlias>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub ty: Option<trap::Label<Type>>,
+    pub type_bound_list: Option<trap::Label<TypeBoundList>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
+}
+
+impl trap::TrapEntry for TypeAlias {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("element_list_exprs", vec![id.into()]);
-        for (i, v) in self.elements.into_iter().enumerate() {
-            out.add_tuple("element_list_expr_elements", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("type_aliases", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("type_alias_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if self.is_assignee_expr {
-            out.add_tuple("element_list_expr_is_assignee_expr", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("type_alias_generic_param_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("type_alias_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.ty {
+            out.add_tuple("type_alias_ties", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.type_bound_list {
+            out.add_tuple("type_alias_type_bound_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("type_alias_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("type_alias_where_clauses", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TypeAlias {
+    fn class_name() -> &'static str { "TypeAlias" }
+}
+
+impl From<trap::Label<TypeAlias>> for trap::Label<AssocItem> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of AssocItem
+        unsafe {
+            Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl trap::TrapClass for ElementListExpr {
-    fn class_name() -> &'static str { "ElementListExpr" }
+impl From<trap::Label<TypeAlias>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
 }
 
-impl From<trap::Label<ElementListExpr>> for trap::Label<ArrayExpr> {
-    fn from(value: trap::Label<ElementListExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ElementListExpr is a subclass of ArrayExpr
+impl From<trap::Label<TypeAlias>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ElementListExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ElementListExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ElementListExpr is a subclass of AstNode
+impl From<trap::Label<TypeAlias>> for trap::Label<ExternItem> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of ExternItem
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ElementListExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ElementListExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ElementListExpr is a subclass of Element
+impl From<trap::Label<TypeAlias>> for trap::Label<Item> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ElementListExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ElementListExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ElementListExpr is a subclass of Expr
+impl From<trap::Label<TypeAlias>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ElementListExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ElementListExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ElementListExpr is a subclass of Locatable
+impl From<trap::Label<TypeAlias>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4084,65 +9339,96 @@ impl From<trap::Label<ElementListExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RepeatExpr {
-    pub id: trap::TrapId<RepeatExpr>,
-    pub initializer: trap::Label<Expr>,
-    pub repeat: trap::Label<Expr>,
+pub struct Union {
+    pub id: trap::TrapId<Union>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub record_field_list: Option<trap::Label<RecordFieldList>>,
+    pub visibility: Option<trap::Label<Visibility>>,
+    pub where_clause: Option<trap::Label<WhereClause>>,
 }
 
-impl trap::TrapEntry for RepeatExpr {
+impl trap::TrapEntry for Union {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("repeat_exprs", vec![id.into(), self.initializer.into(), self.repeat.into()]);
+        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()]);
+        }
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("union_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.record_field_list {
+            out.add_tuple("union_record_field_lists", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("union_visibilities", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.where_clause {
+            out.add_tuple("union_where_clauses", vec![id.into(), v.into()]);
+        }
     }
 }
 
-impl trap::TrapClass for RepeatExpr {
-    fn class_name() -> &'static str { "RepeatExpr" }
+impl trap::TrapClass for Union {
+    fn class_name() -> &'static str { "Union" }
+}
+
+impl From<trap::Label<Union>> for trap::Label<Adt> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Adt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
 }
 
-impl From<trap::Label<RepeatExpr>> for trap::Label<ArrayExpr> {
-    fn from(value: trap::Label<RepeatExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RepeatExpr is a subclass of ArrayExpr
+impl From<trap::Label<Union>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RepeatExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RepeatExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RepeatExpr is a subclass of AstNode
+impl From<trap::Label<Union>> for trap::Label<Element> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RepeatExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<RepeatExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RepeatExpr is a subclass of Element
+impl From<trap::Label<Union>> for trap::Label<Item> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RepeatExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<RepeatExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RepeatExpr is a subclass of Expr
+impl From<trap::Label<Union>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RepeatExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RepeatExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RepeatExpr is a subclass of Locatable
+impl From<trap::Label<Union>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4150,71 +9436,75 @@ impl From<trap::Label<RepeatExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct UnsafeBlockExpr {
-    pub id: trap::TrapId<UnsafeBlockExpr>,
-    pub statements: Vec<trap::Label<Stmt>>,
-    pub tail: Option<trap::Label<Expr>>,
+pub struct Use {
+    pub id: trap::TrapId<Use>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub use_tree: Option<trap::Label<UseTree>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for UnsafeBlockExpr {
+impl trap::TrapEntry for Use {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("unsafe_block_exprs", vec![id.into()]);
-        for (i, v) in self.statements.into_iter().enumerate() {
-            out.add_tuple("block_expr_base_statements", vec![id.into(), i.into(), v.into()]);
+        out.add_tuple("uses", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("use_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.use_tree {
+            out.add_tuple("use_use_trees", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.tail {
-            out.add_tuple("block_expr_base_tails", vec![id.into(), v.into()]);
+        if let Some(v) = self.visibility {
+            out.add_tuple("use_visibilities", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for UnsafeBlockExpr {
-    fn class_name() -> &'static str { "UnsafeBlockExpr" }
+impl trap::TrapClass for Use {
+    fn class_name() -> &'static str { "Use" }
 }
 
-impl From<trap::Label<UnsafeBlockExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<UnsafeBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnsafeBlockExpr is a subclass of AstNode
+impl From<trap::Label<Use>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Use>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnsafeBlockExpr>> for trap::Label<BlockExprBase> {
-    fn from(value: trap::Label<UnsafeBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnsafeBlockExpr is a subclass of BlockExprBase
+impl From<trap::Label<Use>> for trap::Label<Element> {
+    fn from(value: trap::Label<Use>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnsafeBlockExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<UnsafeBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnsafeBlockExpr is a subclass of Element
+impl From<trap::Label<Use>> for trap::Label<Item> {
+    fn from(value: trap::Label<Use>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Item
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnsafeBlockExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<UnsafeBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnsafeBlockExpr is a subclass of Expr
+impl From<trap::Label<Use>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Use>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<UnsafeBlockExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<UnsafeBlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme UnsafeBlockExpr is a subclass of Locatable
+impl From<trap::Label<Use>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<Use>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Stmt
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index 5359270d46a85..cc2ffb896014d 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,402 +1,762 @@
-lib/codeql/rust/elements/ArrayExpr.qll 3ff580537cdd4d43a60266c503c96825013b16a0668bc9c8f691646c5ba575d6 0c84de8466eb751c2d61c6d4783a157b78856dda517091a4bd33e02136df0b20
-lib/codeql/rust/elements/AsmExpr.qll d3ffc90633b7bc6420776cfd947c1b52972c94f78a37df2a0b29f67314f9a562 199ba0f6dc7517c844d3063a9bc881a19b10112bbe64515c7ada3c32f20e9df9
+lib/codeql/rust/elements/Abi.qll 322ff44609ee5febf82279342caf3e6b6e4decf43e680a81b7f7dcdf94c6b495 2dc061be4ef2e07fa5e7c566f089479b78b70b77fb5467cf342797c9430a67a4
+lib/codeql/rust/elements/Adt.qll fac9cfcc31978e986e43178840a4dea086c3eb74e4f80a58ec396c1f37d3a866 fe442e98ab258ee7c0c19e9bd0f3a113914c2f232568d76308fe99fc47cb1930
+lib/codeql/rust/elements/ArgList.qll e744d6cfc97d377b333538fced346b288e32f5609989b2c8e96c6e6a7d5b7ea6 7b134dcf9bc630409d27dfbce2a8302f4ea25590e55064999c99ef3629b3bd64
+lib/codeql/rust/elements/ArrayExpr.qll 11acf3298800c994e470a70ba50079d8c1e58039eb45cf15f6f6b80200433829 ba06e328d66dc55dd907aae5cb8cdb6021fb154fa029d0d71ab1b4c3fb993ce8
+lib/codeql/rust/elements/ArrayType.qll 118e8f2cc393ac04d48fc9d5f51f27af76bfeaa32a7677673f593baf142aebc3 6827a9cd5a16d6fc2195725e2a8f39d83b023dd45e09f3e6ba74e102642ec903
+lib/codeql/rust/elements/AsmExpr.qll 809666b0a7ed2c1e15618e7a93ad8ef78d8201de3f4d19c38ce63bb3578d05fd ec7419a5c93cb3eb00adbba778967f90a1ce25aef891f3bdd704f4885dc1080a
+lib/codeql/rust/elements/AssocItem.qll c6609cffdd0feb8f5d5bd032aaefaccb4954bc4857147c3fa8da3df9533c3f89 c3aeaa01b37d46a69c182713e26e7be048665d965ed263198b992a1c4f78b9bd
+lib/codeql/rust/elements/AssocItemList.qll 6ae9a697b5197c893db9b6bab8bdc7d9ecadc60558d9a776fdc20c7741a9932a 07598595241401ea70b5dee3da27940adbe0b69a539e488c9931b38e7a4b61a2
+lib/codeql/rust/elements/AssocTypeArg.qll 3480c11724052f65bbec68d1fb10b1abd2163798ed4b66fa775887810eed6f85 4c9d7cc5b8fb2901f0b067636726eb83d91b9c397db5a812b4d5b528178d43ac
 lib/codeql/rust/elements/AstNode.qll 5ee6355afb1cafd6dfe408b8c21836a1ba2aeb709fb618802aa09f9342646084 dee708f19c1b333cbd9609819db3dfdb48a0c90d26266c380f31357b1e2d6141
-lib/codeql/rust/elements/AsyncBlockExpr.qll 0eebecf321fcce301cae496259f651bc9099ee2f5129ac439d41e42468dbe167 d107b7c2354d0d21e86c0f90f14fc70d38a83f2b15505782ce12e4d4b22cb72a
-lib/codeql/rust/elements/AwaitExpr.qll 2d8e1260e410c8d0877d83f074283f727d31ece4e7aa805a783ee1cf6ca1e782 d29491fd3bed37f56fdcd66545a60a29810b405950e1b1b1de92c7c154ebf62a
-lib/codeql/rust/elements/BecomeExpr.qll fd737b618bc03d60bb30b7f06c374dc97eaacbecb001d6aa40d1e5080a7bfdb5 0a948e62b3d62b2236ff8f088aa0c235e932805efea4fec160e149a7022a2618
-lib/codeql/rust/elements/BinaryExpr.qll c58f392122bfef309bc1c03bc717ca0928046bd9227200ef28d08cb288ca33e7 275fdbd0a465018cdc08c5efddc7f5038aae95326d9068db3ad9a2bca1dd9af3
-lib/codeql/rust/elements/BlockExpr.qll ba5173fed330f839d86848e749b9539d10a8a4f52093542377becfcdba3831d2 04a76a8c5d2d31641db9f3771844207e9be11b63c069e29e16287651a2cfc840
-lib/codeql/rust/elements/BlockExprBase.qll 7559e3575c32442970656f73490263bcf055ce69a57a5558c88a05259329f20c 5059db6a1b4aef51d7d7151758b9541597d877efc8426dd54db98b0b6f3ec5ee
-lib/codeql/rust/elements/BoxExpr.qll a64f9bcce0918beab704f44f2b0d96b8e5d8a7d4dfbe3c1267c04ab15d2781f6 132a3e857581338c15a373054ddbd37c4c81e1a7c501697cf0c0ca7e0f823773
-lib/codeql/rust/elements/BoxPat.qll 51a2bcb85cf4e9361e81ec55afc2277ef87423d34c8e6232837b8c6ff504c519 3502d4196f663f7c0e7a8286f39ddd5a3d0f7dfe8e21d6a64cafc9d093a594aa
-lib/codeql/rust/elements/BreakExpr.qll 0c8d44762e5319a6fd878ad032e5e8d17cf23df87633a1849153ce5bd8134e38 216f32b5bd7810eba037a89fce2ae7e76c05bb4c80199020dd977382e09e14eb
-lib/codeql/rust/elements/CallExpr.qll 3ccf6aab9ee1432810b936fd3a705620067657baab51a1c826eb92a07fb6c5ad d4be8536e319f2e9dbc672969518457671c1b580c1c2ce68563600d5c8ab135a
-lib/codeql/rust/elements/CastExpr.qll 4b45bc6a0fd020951d7f8ecba2897c59b1b24870cafb03a8cb975f5db3282417 0abf0d9e486a5e48a3f546c045b5c7ab0271e8b9961de3608de7fca0a95efc56
-lib/codeql/rust/elements/ClosureExpr.qll 8b52e7bdf5d307f6e6d809f507b7ff5c915284b509bef5ebe2cecd801f51a028 208d359557ab5dcd1d1efe038847921fd7570409afa60500ee665728d0ec5db3
-lib/codeql/rust/elements/ConstBlockPat.qll ea65528e21362556c426293058ebf7dfda9eec0de86810e17f6725771c41c0cd a67423d6ceba670315b935753e686702f1173371a8b96f868048d32df569d563
-lib/codeql/rust/elements/ConstExpr.qll cf5e033722ba39a5e2ef890c25de98e864f5cc08f84ccf802246a4033f30da38 c1712580458066d6f1b9f3e7c30404f3064cd9a67a9d48c78772490dc26b9784
-lib/codeql/rust/elements/ContinueExpr.qll b8d085e5960ad79b0f6e83ee71f62f433bbc7c5165a4d9f627fd605ebced2af3 6125569fabce5a38437338cafefac5d1c1ffb8314feba78b77577db828cbbf8a
-lib/codeql/rust/elements/Declaration.qll ca2cf5f2b47a091de8d169f447f596711060624d86674303c676e0e5e8c73ba9 fa0d1fe6c2799094b976cf5dd3085c9ccc3de4669b6566563fc957464b629b06
+lib/codeql/rust/elements/Attr.qll 3c81c8b8ead6a9f08c29557206c0305aee833d8a6592585b55e9ca79270627d5 44eb7b008600b3e069dd0d92a57e8a22ce07ca3dd012a7ed4185bed56de57525
+lib/codeql/rust/elements/AwaitExpr.qll 05df6468fced57583767ff48e269c433d63fcfe18f1294ef1d6974d0907a733a 55de39c230cf4aaa2eb597582e011819ef5efcaa981654e3fafafb539a1f31fc
+lib/codeql/rust/elements/BecomeExpr.qll 3b623c597002c96229340daede10b28a014a46c6ca2805e910cfdf520062526e 78eaddbf7dc5532bf83a4fec306f706b2e7696e87aefea69b312df74199ad928
+lib/codeql/rust/elements/BinaryExpr.qll fd0c9d707a8a559afef60165f0751a475cb42064e56490815493bd976ac21f46 bd3f0838957c0e9ee8c9d74fb100acbf487175634a4f92ccf09c35a8a584cdc5
+lib/codeql/rust/elements/BlockExpr.qll 29674108e1f538868f9ba7550c494640062e486a125cd2a85539cd95812c3ef2 2c6d0a4a3b40e41ee435b156de6ba01d79d6a33f00dd9fe6f3026e0190c11f18
+lib/codeql/rust/elements/BoxPat.qll 9de030a1384e3152b390019906024d02e25c56dd2d2b3f7a0c44c724eeaca020 c5bee47a9319bc45963253f7c199eb53ea579b114e2436236a4be697bf35e7f2
+lib/codeql/rust/elements/BreakExpr.qll 34acf69df9e993786de8f8ef22315752b85bbeac54763b91041f4de58abccb62 62126b4cb10711a5b672505850504a22b58da03054516fa99bf64a26d53f5e2f
+lib/codeql/rust/elements/CallExpr.qll d74e1fd0929906d52a42794803e1ebd55db652428cbf40e0989486f687992974 6737cf81af028f317217af27701b4f82fa9494ba92e5874f695f20a088dbdcff
+lib/codeql/rust/elements/CastExpr.qll 70121e4c843af34c695ce344c984c6c30c01e01eb4332a2eb7305c16d16099ef 70622c526709c00129613052390d752b36ae85574e36c00198a0151142253aec
+lib/codeql/rust/elements/ClosureBinder.qll 5b2d33fc693c08e678e6897329cab21667fbf6a917677eeaea75b16069e42118 9b224af67ca2f4a5161dda5d73926f1e96f051e1e3c17fe1ad44cd4837255bb9
+lib/codeql/rust/elements/ClosureExpr.qll f90360d132ed97a1ed4e44b93fe0cadc00c9114e8dfef6b1fe3a5562f9f7a13e 45a0fdb3ad2cafaef61e869f2a55034f3ce720f469f5ee52f3010c1737c329a4
+lib/codeql/rust/elements/Const.qll e003e11620b24b83648d0220ee68012bbd102b572d764253144f00a9407fc957 567e8d60af7a0d4c8cee41f9cb171643b9d2f12cdc1d778bdc02a6a9e00d9318
+lib/codeql/rust/elements/ConstArg.qll 55b1697280cd21f80f9fba946eb377f5188475e003e09667b414f76c6423835b b261890b6756df3d8292a467a483f8ccc124e26ba6a82fbc88470c7a90cea19e
+lib/codeql/rust/elements/ConstBlockPat.qll 305e1abfa80f3421040a717d95b57a3a7c7d5c1f0dbcff1e08db29f184497d18 07f6c445585af7b45b5df79515add06ca4cf354daa43a4d549145ddddf6ac08f
+lib/codeql/rust/elements/ConstParam.qll 4c9c989432ec160446b4b3665f0abb9f028c1ef15bfb599c2495b28c17dc39ba 911ea1e14a8451bd5c8191a670c70aa35d093d471a4d7153763310b52c2a569a
+lib/codeql/rust/elements/ContinueExpr.qll 4e841104fd15646febdf15c63ea97ba4f5ba7066f324df904ca380b49ecccbdd 90df1113319797cafb33e9cde01c2344ed6422083f402e16b0baf894506ab91d
+lib/codeql/rust/elements/DynTraitType.qll 9568fb61369889d2f943a046f736ba517a1441dd69a79249df55787cdbab3ca8 6e5c6b7c91354e204e45162b17cfa3cfcfb448b967c1fc140e5816c8aa9f2707
 lib/codeql/rust/elements/Element.qll 0b62d139fef54ed2cf2e2334806aa9bfbc036c9c2085d558f15a42cc3fa84c48 24b999b93df79383ef27ede46e38da752868c88a07fe35fcff5d526684ba7294
-lib/codeql/rust/elements/ElementListExpr.qll 337ba9aeba7e7696ca66f2f63549ca99df80bb5f9883479dab412960fdbd9b1b 415a2e800a6bb347b4f6d983fb97755f153920f37b3c7bf6dbd875dc301b5078
-lib/codeql/rust/elements/Expr.qll e5d65e805ccf440d64d331e55df4c4144ab8c8f63f367382494714087659ffe8 2bbc1e5d3a65f413ec33d9822fa451fbdbe32349158db58cc0bfcfafb0e21bda
-lib/codeql/rust/elements/ExprStmt.qll 206574b779af3c4c08ca25d5a36e2a004dcffc6e8974f28af2e9a48c37bbc55a 62dce160dd1f7e1d44398636169fcffd1bd02a9467effce7e8b807676b59b4a6
-lib/codeql/rust/elements/FieldExpr.qll ca325b90659175294d49d89695895df8a9e16aefb37c54118184adfef6a66651 891f5554c04fe20d2bf6a4bf0df72c8598391e0be28a9a630fc780838febd51d
-lib/codeql/rust/elements/Function.qll ee92c430b46efe4bc166c650b470753ad5d5149c762995aef746053b8abe9762 0980dab645e40553971f7f9b8377a96804f6378d515f51fc855b0b08fe540df8
-lib/codeql/rust/elements/GenericArgList.qll b4a227e3e1b71b44aff13cea6702096ba18f3ba94dc54f20bde8782943b21b71 654837e5b4f846a5c66616177a1f6c0c3cb4c54e1a6d7cc0c6b7dbb46d09397e
-lib/codeql/rust/elements/IdentPat.qll 9db1ded7363f1bd1557f9f38659b82a0262003f6e26b9e3cac26247f1c102fdb 07481fcbdc42b3e2b3c4d7cf2013a304d964e87172afb1208ca4cbddb54511e7
-lib/codeql/rust/elements/IfExpr.qll 42d23455bb4778ee3ec66dc0aae5ec368bee9203fc13de8724296147277b0685 80d974d0c57eca272147e244c5c80fad1ec2a6baab422d2eba46712ecafcac30
-lib/codeql/rust/elements/IndexExpr.qll 0fa4d6a10cda7d07ed85555d5f2164f794eced095c2b85d66f156b5ccb15cf9a bf95a663b55c4940a06a2ddd5d1d7083b07eb514ddf54e170770089262e08606
-lib/codeql/rust/elements/ItemStmt.qll 3f06b2c6a09d2df698ccf142aa9c0e6a4f78a731f4dee42959d6cf09fd0d7e1b bf876bcf9e206c71d2f0eb6cc5fe1c5e8e074d394222f22c75359d97a1102080
-lib/codeql/rust/elements/Label.qll b9809e3b9e2154198d3d3e87077a136af143fc5851f146d8929791b5c5d42285 8159cfee373bdbfa0b6f610d703ab30f94478ff1586239e2d25bf99110b792a0
-lib/codeql/rust/elements/LetExpr.qll 4f286c8a6b6fda849d5209dc94f0773f2221efde44170c02876e54f71a480fdc 20990fe00da50731f1e206ce049c1012e36b2450912136bfb3b55b1d0d6bc017
-lib/codeql/rust/elements/LetStmt.qll f75e97bcf758d578e666f2db675f152ef5b6a9384f5c6dd98574c4ac3ffdab42 a33dcda09ad085fbfe05e1d0a4010a3bb07c86f60a7c67caeb5a2251407e9159
-lib/codeql/rust/elements/LiteralExpr.qll 4ba22d7b46de3e115a8eec82b611dc389c7ef9b1181899921dc68f9bcca3cc63 101b11b6761d27586ba5daa9b2c7d1d7247cfbe66eb84506e8ecf15f4baf38a2
-lib/codeql/rust/elements/LiteralPat.qll ffc6e5114d8a18464cc60d7a8e33269f250fb9092f121ef0aae52c8eb2a2c694 38ef72034d68c5ad5ce9efcd7508e161e907a5b9e65a773f645e9f8fd20c163c
+lib/codeql/rust/elements/Enum.qll 89d2a76878dc4105747fce91bc3c06afd6cf137cf5f14efe4f5cead2b1565bdd 52be812c69a8a96750128549b4b2c0f2e39ba8588d0a69a53d5bb4eb791fcf44
+lib/codeql/rust/elements/Expr.qll ab5c72082c789544429e0695f2f8ab9e48ff82dc23b46e045c7393abf4cf9b87 53681ee07d2ed3c10441edb9549b3901f9f6742bdc51ffe73d8d5cd71c298326
+lib/codeql/rust/elements/ExprStmt.qll b2a2f778b9d79214b98f853e08590454174ee1a35288faf50823b512925f1df1 ca616cb9da0f51b6b719410ad99a505e9d4740ad2ed32bf7ad737df7a21070dd
+lib/codeql/rust/elements/ExternBlock.qll 815d0cdf459d57e38b1281cb288e4595824caa2e7c860ba3c988c209ba8e5362 6d6e0eb80545d08afbe0bad2472889611010534259bbe9628d8b7b781e1bd581
+lib/codeql/rust/elements/ExternCrate.qll b8b163815ab45307c732809c4813784c93ce97b97e7b0478f2404e25e6e41179 4647c3895a5ed7039c3d8317399e23c3420ad5e3193d9a70441abd3c8dd4361a
+lib/codeql/rust/elements/ExternItem.qll 41e79b67937795b6eca3dadaf3b668358f7de0b56077a2f4cc99b37ba3f79df2 adfa255c5e201a42377b0e591e09b8747fe2641f510129750b804fd5bdd110e9
+lib/codeql/rust/elements/ExternItemList.qll e90fe2d5805d81802ada7300a309c2b0e190223d2203420970ae9df40c97559f 2d628d08244a1fab9c703fb9eec0b96737681d001ffa5e78b27425de983762b6
+lib/codeql/rust/elements/FieldExpr.qll fb7202dc05aa694fe28eaa724a9c59409a196a55be5542aa25aff4d5ef9809d7 ab6e5d0ef4da3076b40eb450989190218b534aebcba9dc5f3079efedc045371e
+lib/codeql/rust/elements/FieldList.qll 521b88b7df0cc559240ba53abeb63c9e6e306ebda90544b4d38968c1b2f9226d 130f057c42ca924a1b97bda82a77c13a679aa8fd580a18b4344cc7ad03a0ccfb
+lib/codeql/rust/elements/Fn.qll bc9399b5bcc6d271ad3d3e95a04dccca470dc0fca59d02b8a1285c09bed7df96 005e99d43a197ac26ffc8b98af5632665fa411cbc23e1380730535b84e67e558
+lib/codeql/rust/elements/FnPtrType.qll a77b5d7fc19fa141e08ec086dbe120cdd14d4db18473967268f737fd81ce2a68 ae5b3ee8a62a1f608a7e93ae30fc2475fcb65ee080cfcc8b2cdc2d274dc24d16
+lib/codeql/rust/elements/ForExpr.qll c5d48fb35d0797b05a567fc6c769651cb9d32f327a66432870d21a7e56fe84f9 dd6f86a1fb462d764d77d5474fcfb9e8e43041b0b5d1928a0c9ca575b807d617
+lib/codeql/rust/elements/ForType.qll 8c506c94a47da6569da315c61b4e7670f3d9cd90c5eea9dc3e2f07f90b980058 af8d972b21e93a75da9aca9982660b78f4514a8f1ff9b119e050bedf3e85fb59
+lib/codeql/rust/elements/FormatArgsArg.qll 5f4635101ef3a7de0ce27dc3ce0e9ddbfff92bac6266c2dfe1bc0949a9fa7f35 dde33150ce905f18e96db9e5d5cdd15fbf7f9aff78f91a5c18b183d1e4f925e3
+lib/codeql/rust/elements/FormatArgsExpr.qll e0f54d22bfec9fb8cf1b90627a419c47042c8e4bed90ebf2a040be0f95ee1f7f 02d9ae076dc8d5791bb6cd5200dec2ca888aa6f68c867cc0f918dfa3d5033bf6
+lib/codeql/rust/elements/GenericArg.qll 1b45a5f91e4a3124cab7123657608bf9fa2985ebb8272d1f227696d36df77464 5954d7feda97ea092dfa5eb615d00fdb6f863507a96610db13dcb590713091c1
+lib/codeql/rust/elements/GenericArgList.qll 2421509f1dd45356c2421b03ea18125661f1b8d81c065cfd0ca3616f28af921a 0dd495642c68ab5aff0458033c529c23d6d54b53532969d2953f6f07ddc30a58
+lib/codeql/rust/elements/GenericParam.qll 7810d9e153c088b751beba5f0d1cc264bf72874dbdcb2cb0212002d610ab0928 4615742f478a7423b9c8b0a1967923e2532e3b2fa013c8bc2dcf5d25ae8e6d65
+lib/codeql/rust/elements/GenericParamList.qll e85142f953f232b3c9fad15df39cb1246d21d27f8400a60483d1744c51cc2f49 407ee992651a074846028bfaa66649c6b785fca6456b47425ba4ca8bcac6dd5c
+lib/codeql/rust/elements/IdentPat.qll 8d1dc7eda1f71ad69cc20f462892a8c46835f042f5e1d0b213b264c405e86de7 41136f510070ccecb3a77031a6153cceccf2ddf7e33cd67c210eb224d10e8677
+lib/codeql/rust/elements/IfExpr.qll 02c836a36286082409532403526d2d9e082ef209e44b921a7b72d2eddc8f04ab e96f1d12f34541e3ccb250a64bf455e588859d64637a192b50cd0078b4e6be23
+lib/codeql/rust/elements/Impl.qll a4406064021df9a687dff0e64b961cd5d59f70e17811a18212a33b30258c24f2 7a45499db4f248139d6b3c7b0d7e2fde81dfdc8f7cb1cca5d7397ca7ac125f50
+lib/codeql/rust/elements/ImplTraitType.qll 191197e916563ccb3091c053380167920448e5c9e2ac227e7cb74c5148b13e61 f178176f36023d5921780832da87773195b7965c6f8f44e2136927b394d51429
+lib/codeql/rust/elements/IndexExpr.qll 5b1319137e56e536fe27ac04d52775f6348c5ff363d286ccd050b36c3de93e72 aa34d9951eb54d5340998a9f8b3759cb812737ee150044aa2d096c04bc8bffdb
+lib/codeql/rust/elements/InferType.qll a89c394700c8fe40e52bb78fdfc5eeb7b08843cfcfa727704359eae87e32eead dd73554e97e727469ab9a55822aa738d3470b6e2956fb092cd6190618b6e8797
+lib/codeql/rust/elements/Item.qll d822fafd28c573b4fe1b42838ed58cea04ce0f417cb7704148a097531f86841c d15d24bdd2564f284e8e5a15c9e88036444394909a270ca0d449ce6126ef44dd
+lib/codeql/rust/elements/ItemList.qll 621661f43ef2a0955f101b3cad3687fc2b5a6a13ccf54b5395f81ab0c870d97c 02c23b9b6debeb84632b1c09eea9fc21ba6b5ee37109524a596e23aa394157e1
+lib/codeql/rust/elements/Label.qll ffd5dc0dda957c93263edf04ff2b2490fcb69595ea1f6fd39a99dca51f0e04ef e165d1213afb54f3db5ba2521d5cdf0e77595da3f162f6eb2717250fad100d13
+lib/codeql/rust/elements/LetElse.qll 4574e2a8abfd2670b20f6ad88473a70bedddc2725ad033630b6942388f769978 97b2ebf3e0d1b41a8333f09a919437ec47ca0585e35e006aff1cf929998cbd48
+lib/codeql/rust/elements/LetExpr.qll 534e11381c83b6f5db95baebd16e86b5db0ca1eabed547278386eb7dd3caf79b b6a173e4057e83d5e498556ea40be0dcf2d9712a1c810b7edff073049e103fca
+lib/codeql/rust/elements/LetStmt.qll bcbc29eebca8aab82598e87c47e745b88b6e870cb254065c7ac66e43a81a12f2 c86c14f877ea9d241cfc16c69fdeb67a2baf73064c348db44299bdac9bb63695
+lib/codeql/rust/elements/Lifetime.qll 301c0e27d7af2a9806d4b3a51017e6b5ed32608b21506253edf6363edeeeb6eb 866876f34b8955b17f334aab2f70d5daad09aa72fdc598d1c24d533825aca4ef
+lib/codeql/rust/elements/LifetimeArg.qll b32eca7690196f868a6f13a403f0a82fc015ec0061f8004438e2914ed4fef99e b76ef565c1cc811b9a674f761bb28229f7ba59af8e7ed44738ab928a07c00f32
+lib/codeql/rust/elements/LifetimeParam.qll ca52a21220761530fae5bc655147d4450f07576d6cf6c17ae9424a6002b99cfd 88bb222864816b06318575bc7053da8972247657392f9bd65edcd1f7fb40648c
+lib/codeql/rust/elements/Literal.qll 910f89d37d8b74537154ea16382bb94bc0b238d17337c271a18b314fdb2aea9b 21a8e49b4b0e24ab5a921ab8bbb2c08e949fe9c90dfb5e46d7170df9657edd7f
+lib/codeql/rust/elements/LiteralPat.qll b15832acbb3038cf47aae7d4d3aefca98977044fab941395af80f461aac7fbf2 47dc7045d844b7ed31e713ec07a371c9c7c8d8d8c5ab2910e83bd58b07508186
 lib/codeql/rust/elements/Locatable.qll 2855efa4a469b54e0ca85daa89309a8b991cded6f3f10db361010831ba1e11d3 00c3406d14603f90abea11bf074eaf2c0b623a30e29cf6afc3a247cb58b92f0f
-lib/codeql/rust/elements/LoopExpr.qll 0c9377e49bf5e21d3ad6dc6c62326d2ed687cf4e5401886134c1f9c5545eedc9 b9c9cdf84b83956aa1e78eb6046fd8d77a6f22c33038f9c7028276672bb7d6a8
-lib/codeql/rust/elements/MatchArm.qll 7c0da399db9f5045127c72c571215c16cb7d733f04e078ac6b3c115487a2e205 6b6f35d2e7ada55962a2860ff84fc651cb22a7beb97cf6b33c93ae9893d0ba28
-lib/codeql/rust/elements/MatchExpr.qll 2bc8aa89eaa2342bda9a00eb8b5c67944167f12a60ca2adc8faed10a537e22b0 69f5cdd01950ecfbd28072a473123cc8c4de7d67265758b13439c4d7ed3ba3e7
-lib/codeql/rust/elements/MethodCallExpr.qll ed6361a15d0d7dd726b800b88f0e53a3a17877715eb63432d27a05a0757aa71d e5e6063fe1faea42ffc998bfa90b3a5f2f01cabca15c4ed31b2df8c6dbbc2b6b
+lib/codeql/rust/elements/LoopExpr.qll e958cc58f4900bac20cfc7daca2bf427c2eabe6cd7d2ae1e7f74fff21ac333a4 65101b8488553b926473a1348ecc5e904ea949053ef0a5a8686dbcacb658fc81
+lib/codeql/rust/elements/MacroCall.qll 11302a676f6801ea415d143aa8e55051a45ff40d01780989685b1783e8312a52 b486f1b8282f3fd60e93803437765cb75516f02ce3dcdd7a4ec1278bafee2c05
+lib/codeql/rust/elements/MacroDef.qll a8a2df4bd0b498812844a17bc8397d9996b2075795e532498e79530f652e7f71 995ce0aec88db5b907e55462a29eaad5df5a1a78c339dcddd21ab4b3cdff34f3
+lib/codeql/rust/elements/MacroExpr.qll 3caf5f53f537fe745ff21eca903dc1a8094a8b525f3ab2401a03d8c2f6282d44 a5ddf8e05b3773bd845a3e82c22aa3164aa096ba780260b76d1e9ce30f8c218d
+lib/codeql/rust/elements/MacroItems.qll 4acf8e5ab8f84dc8fae442d52a29266be2f1e7160120bb1dd52238b3d62b4cab 0d6e25bbf1f3082b739bb846d7c3ef21a58c79e6a65b72272a00cffc3d32aa47
+lib/codeql/rust/elements/MacroPat.qll 46535f173a99a4cf576ca9d56f609628bab7d8642e4d43f1f6486dc27e4d8732 8fba3149baf8ebe9412f5e9aff2dfc60ce44021c6fda955c31079e665382a681
+lib/codeql/rust/elements/MacroRules.qll 9b65c2da9615838db92f3a19cdabea55d533c1bc93221449ea0dc002ff2cf9f0 74da2a5699f86333ee48253f4bb1ab03828909b0eff50d57cd9c4ee4b3109d04
+lib/codeql/rust/elements/MacroStmts.qll 66b3e877c4e3f8ef552152c92188aae7d5901a7b2e21dec581a61ee390be2fbc cc535cb6afb29783be37b1647d3267dd693c3434d42e1ab561d3a6a74ce20cfc
+lib/codeql/rust/elements/MacroType.qll e494b7ee3d1bb9bd2107c60cab9f75748b479402f43180529315b36ac87f058a 4935cefdfb39a9fb781b5951ab5c89ed0f6f3232df13aca828f852986075d30d
+lib/codeql/rust/elements/MatchArm.qll 0a525f57585a22c60a62e14fc543396432b0306e0c5b76c5ca470095ef5522d6 4cf161041fdd262f11af1c705d96ebbf2a32ec6775db7421d049dbde974fbf99
+lib/codeql/rust/elements/MatchArmList.qll c1528b48d956a8fcbf70bc9a5c7ddbe13c741c7f59a2938c4a9bff052e0476c2 ed0dad75585cab71d5d4d49790b6c68eee78aa8a9bebefdf3e197bbf6a75452e
+lib/codeql/rust/elements/MatchExpr.qll 040509624fb0b1c40455a05968e8e7dff3aeb4cf806815d120ab377617d00992 fa6ff76707ba73bb6e67150ff35b9d9c16076098e44aca152df055a09dd6201b
+lib/codeql/rust/elements/MatchGuard.qll 89bbd82f98e0ea6e7345656f2c8c496c63571651605632a29048c16b95f44251 f82e00902cb0d40ec0a9bee01b376f64d37db9436c3beb54f9d803bb5a6671dc
+lib/codeql/rust/elements/Meta.qll c9c3d5d8116e0e5ae56fbab028326f84a85b08f929ff20629ae4fdfbc52dc7f6 f85f763274564c54996561fcc45ff64ee8761c54834e3d5ee2dbcbf1e1fb906a
+lib/codeql/rust/elements/MethodCallExpr.qll c99169e6ea85330ccc6bf8153778e4b76487e7643865f385ff40614ab4b574cb ee80107df869157ed63f4069ff01b40d56a43db702dff39acd637797ebfb5067
 lib/codeql/rust/elements/Missing.qll 70e6ac9790314752849c9888443c98223ccfc93a193998b7ce350b2c6ebe8ea4 e2f0623511acaa76b091f748d417714137a8b94f1f2bdbbd177f1c682c786dad
-lib/codeql/rust/elements/MissingExpr.qll 7b2685638c70197676bacc7bc217577b9f582d02cdc50e7b9e9f1a969d828bb7 b4a4493ece8819a3d48ec30710e730d5c7a2640d99d8dfcc69d8af7486022ac7
-lib/codeql/rust/elements/MissingPat.qll 857d7366362dee22aac881149ca8dde4f3e5b164ffa2ee25dbdfb51f2c5359e4 3c39cacebe0fa6e56877c731080e49334e7417aa57df0f3766c0e9f4b8a0ab3a
-lib/codeql/rust/elements/Module.qll 803448ea6741f93956f7f18c5d45d3d76e72ed50d015cb270f24f54b204de195 1d17c52f7dc7f26697e25d69e3857c87db1eda3d21940fb183dade063e5dc5eb
-lib/codeql/rust/elements/OffsetOfExpr.qll 65a07a6f2ea297cb46a35e31bc82f6ba4abd96be6388f8ad600101ed30b2aa4f d152cf8b4469a21314bd70c3d9e0669f21c61ddaf9d52188946bcd75d35d142b
-lib/codeql/rust/elements/OrPat.qll b917c475b5e62f67ee6d7a523a7957e13e225052070f896a42bcf089925c75c6 106ea231288242aef2eaf9957dc47ca6bd5740baac98f32c3a631b0cce4ef1ba
-lib/codeql/rust/elements/Pat.qll 56211c5cb4709e7c12a2bfd2da5e413a451672d99e23a8386c08ad0b999fd45c b1b1893a13a75c4f0390f7e2a14ee98a46f067cfdc991a8d43adc82497d20aff
-lib/codeql/rust/elements/Path.qll 496cad55786bf79337cce857e3528c725afdd2df9facc3787bd4d7a1f7c90591 e30222997416c64b9be828d379c7f591daf4ea7eac3524f0e2c85799bde15a7c
-lib/codeql/rust/elements/PathExpr.qll 2f2315a9349e90e4ca4e7c262d8139da698707fcc4e372574256ee0b53f445b3 f8498f66a15561091f01abcf8b0a667e41147c5cc446f65d560530a3a1721fb8
-lib/codeql/rust/elements/PathPat.qll 5c525c2dc3815f44df471ea2b76106bb6b6e76bc7f0c37d1b26b89e246163079 82a5b3c80176728d996943cc558f15eea44a1b06b6a5b37b1353c3494d8b1b06
-lib/codeql/rust/elements/PrefixExpr.qll 5b06537896fae9bd491b4e2658df3cef07203ee29c60bcdc77b3809ce05d0d0a f5f538bc738c46321df50be2299a2907c568cb6f462c70aef91bcb559dbef39f
-lib/codeql/rust/elements/RangeExpr.qll a3bbca00b62db2a6242a47a5f6cf86d268d44157f1bf294e4667fa8bb56a9cae f3e77575a6daf4a6abb30bef945ab1894b7623394f4bf199b31328bb82ac8e18
-lib/codeql/rust/elements/RangePat.qll 41ea5fb1967c8e2e40e54692b5e4a803e521636cc07dea50af67fc60a4ab03e9 e01e765bab833465bf2551e0cfe8348461e8dd7bc818475039b61e54e54018e4
-lib/codeql/rust/elements/RecordExpr.qll 84f23c2fadd3862a12ed9b08ac71580ad5ce017949b4635fabf763ede575dbdc af1a61a2fc2b0588b485bb9d6463cce8d4805f42fe8496afe095304867e5c760
-lib/codeql/rust/elements/RecordExprField.qll 356315ef553d023be0ba959ef756b317b9f2ef2c060653be6031e25c8a937321 2d08fa30b40fd257e4aef66ff491715aef30d91b88797b2960c8420492372601
-lib/codeql/rust/elements/RecordPat.qll 10ae4edd6d01e11ac1604f479946b16e26ac37b8f218e850492ad24a4d70015c 6552be93938e36910eabf89627ab2f615c2f3ab78d1f21d04407b9b38ae19009
-lib/codeql/rust/elements/RecordPatField.qll 41283b06a427efe909caa9596582cabeb9d3ff3233f3cb01f9af3ac3b3a755db 229d7564ec0699ed503c1b2c2ded73a91d31554b4c6767d03e1c14d0e197e215
-lib/codeql/rust/elements/RefExpr.qll c44449d91d1a520a6d1fa70a272394bef20b702c83a85abbe95c46ee8d65948f 2b8e54be1852466356b12756a4bdb7cd8d603d4f24de79117cde17b3f592550e
-lib/codeql/rust/elements/RefPat.qll f1db301e55ecb159d66d0a73a88c5f4e6d00f142c83718500cb095b7a05f0d14 e7af386220e66a2f6073652302786c0c8bcfe650db9a18d29a900748b054250d
-lib/codeql/rust/elements/RepeatExpr.qll 8de66b2781f2f9c67f914d677bdcf1dc5fac045e538d8457854f4fbad563bb7f af6b580650d16c2c2e4e1923689561513ac0037dd8d88d2b196cc317e63ea345
-lib/codeql/rust/elements/ReturnExpr.qll bb59f60a96592040d0257b20e4e6464962a49d61efe9e88faddeaeb9fb885954 8fc54b1bd263903a0c044326664f9d4cceed6431044041789ff824afb4b42556
-lib/codeql/rust/elements/SlicePat.qll 0034a0037e8b8a42e896e5ec48ce731ea8617d1f1e687b43590b16d75c8d8ce0 bcc1706840801f2de0cdd2110548a5ebe61497bfd3371ee4a3ee65f5207cd4da
-lib/codeql/rust/elements/Stmt.qll 532b12973037301246daf7d8c0177f734202f43d9261c7a4ca6f5080eea8ca64 b838643c4f2b4623d2c816cddad0e68ca3e11f2879ab7beaece46f489ec4b1f3
-lib/codeql/rust/elements/TupleExpr.qll e287efd071de87f7638f0e0102b0ceacf6c2490c1136415c6b9063873b05cce3 e4ad88e08e21be24b18a44c8979ee2a7c8957ec86f40f9a253c381643c2bbce1
-lib/codeql/rust/elements/TuplePat.qll 5c239091324ab50d7dc8ddad42cfea1a579f9768ee06ac5999652a5704f35c7b d78295cb1019e903fe3565a9320ce0f4522ee6195a93d54c4000865feef53e3b
-lib/codeql/rust/elements/TupleStructPat.qll c5bfb7c3cf8548f6d2fba3c855f42cca1bdfaf8be82706c349357159c99edf6a 81da9b0e16f09b0340e4bd19d2e1f372a663536770571755ef3a63f07e884cf7
-lib/codeql/rust/elements/TypeRef.qll 6a09c9d5bcf072c18d502b8cfaacd3f1c61f93c155e69b8da5ab5d51ba2ebade 44435996fe3ddd2fd75580b5a65b3029a67d8b36ca65a9d2744b24dc36e24329
-lib/codeql/rust/elements/UnderscoreExpr.qll 81fb22bcab948b96eaea66b00bb1d18d2fb51d998659252a6dea2bb96ba5ffa6 09c839783319c3b72029914006f2d080b101e8aba3482a67f9f25aa2d2668a7a
+lib/codeql/rust/elements/Module.qll 3b056c11691766f8ea87140812fde2b7130a5460e5f938c0fda1e2587cfe9c77 c18d6576cfbe6b3becf475c795dc533dfbc4640e88e4c8d58ca9f311b7d4a412
+lib/codeql/rust/elements/Name.qll 02e9014297ceabe390dedbef555328c80b227972395447b11830ee14d6910576 8ada21fc70bf25e22fd826977cdcdee663ddefb951f341c2337490b7e8301efe
+lib/codeql/rust/elements/NameRef.qll 6e7df9bf072a847623ad4e29b0d93eb40c81f87e6884a3a71ba1694389cabbd7 d7444a0bd177335c3469bd43fdabb7103372c06f145d29ba4258904f8e0ee1c3
+lib/codeql/rust/elements/NeverType.qll 1436d611b67ed5e3c8083505cae63fc2936613fb2c810838abb115aafa9e69d1 29b25b051bb3adea9d910338608422cbf8247c02e96bc00c901ee392565b49df
+lib/codeql/rust/elements/OffsetOfExpr.qll 0ebfab0fb8ee9e8f5034da7f6df1edb5465619ea31c81ea0e48468f7adb2fb06 216c4a31fff24956d052f4964fa81e34c07fe140d958d9c1d5e242ecd2fa9b6d
+lib/codeql/rust/elements/OrPat.qll b2b1c91c34a2ef56a4a62e82dc6ffdf2b857658e0618a6b8a7c87088c3df633f 9a6ac1862b645acc43e1e122218fad01e9509d40f76d567fff7a48a9c93bce09
+lib/codeql/rust/elements/Param.qll 8dfdfa6a43c891abf581134678c39b46eb07d7362a4913b26848beabafa28bcb 11c54d13790dc9197dfd41956839323a88d59a111ff6e7bfa9b65f400596a13f
+lib/codeql/rust/elements/ParamList.qll e3531c564025ceae12aae5052aa973b9526759b11e3728a486b307957cdcb4b9 e681004ba2cf954d497d1d053a111c065fc1249df7ab8261939139631e63c720
+lib/codeql/rust/elements/ParenExpr.qll 0bbcbde9fdb475fb3283cdface0ef56c63a61af94e75afeace91af2a920b1945 097309cf4630d2ace72e6438d54170d2c555f860d3aabbf3a12d1465dbc7ee4a
+lib/codeql/rust/elements/ParenPat.qll a67e472bca21b732081ca8ab3d0b5baa9edb626211f92a4c2cd92d5430b2d4f9 35eb182f9280cfcfff3ea56a5e0d9ab09aa8854cf4c505951d00dbc70de4a045
+lib/codeql/rust/elements/ParenType.qll b2e4d9379b492577dbf41efa5da5b40f35b60462747c47b720a1147d13a923a5 86a2ba4cee6a55b9ccde38fb09427ca634484d767115803e93af2f1ea51acb36
+lib/codeql/rust/elements/Pat.qll 03e6cc8118e924ef0a594e1f7f768ff58380d767bfaa6a4c9601a0c7bdf78cf9 913d152fb4879958cbe630945d771e79c393284720106387cbc958f11d7a91de
+lib/codeql/rust/elements/Path.qll 6cb729e4f5d68d26ee67b98a5719ecc9180bf38b145480dfa02d6addc1529045 1106b0418d624febf12af4b1a308c4dcc69e05ebc8d4aab1a247980672fab04b
+lib/codeql/rust/elements/PathExpr.qll 0a2df31d2151cf24a403179b902c79c4b271761e318d6d25cf915d68d3739695 7eeb90954a858b447079bfd94a545664103af89bb46a9d2cb2b4b823b05b4e1d
+lib/codeql/rust/elements/PathPat.qll 93e08eebcfd13a1e885eac0f4d1aaa3bcc9b8263f640a8fde6fb23b5bc857454 61f6481a75d261f95084828bfc4ffb1b80519e11b5d8343540fac71e4d7cd874
+lib/codeql/rust/elements/PathSegment.qll 9a8e0fe212d2248f1a0c6a49db9eb42c939e9f4201ea5ac14e8aef4718db40ba 241acc5d864ef7edec29ab165db4b999ed4ee7dbce191a7c7541d240549732d0
+lib/codeql/rust/elements/PathType.qll 7bbe0cc5b1ba1c4536bb1d6cfd38253d60bc383b0a456720c6faf9f6e2e14a57 66c3c429dec5be50e9dc1808b7fd4ff7818414649d6d19b6547176ecf06c3e75
+lib/codeql/rust/elements/PrefixExpr.qll 9ca37b526b956cadf11688a8c2196d4545ffd5debd8bfb797f19b3eb4ad89e77 35219ee4993863fde6e1faf6746187a6e4886364223ff17c2d29d9a7b7bee41d
+lib/codeql/rust/elements/PtrType.qll 247a889059913f9f76628d0120f6f45729b55b10286f38e57f128446900a78dc 72f4c696db145c42927df26ad352a1d76003c5697125b58b87368df591fb9518
+lib/codeql/rust/elements/RangeExpr.qll f4046b72f3360b9943ed0ef517fe346c9522aa0d66828ba5bc96b1b06adb8d4f c8cd0df781c6e84e9c290dabc823c763b167b68a2aef68b23ef129040e1fcc0c
+lib/codeql/rust/elements/RangePat.qll 1cd02952efbd556d30c936678bce54ff5b88436858479eb9db54a33e0d31c30c 4c0cebde21d6e566507df112e72bbf95ffb3c5594353a1be3043c9950342c141
+lib/codeql/rust/elements/RecordExpr.qll 93df401c11de8027e14abfb6bf82a59f9214a6bb81071ef920f1795d77ca81b5 0bcea4b6146435ea1dace83836edcd624daf67ff4f2e8422e43d2ed5e99f9027
+lib/codeql/rust/elements/RecordExprField.qll 28ab1d9406341b3ad1b4737a828dd26e78265ca22645bb8c21c689eb6182ec47 5aff0ebeed1b2f4c753339582877e95e9a6bdbb5fbdf50a6fad1d99df651c10a
+lib/codeql/rust/elements/RecordExprFieldList.qll 71f140d9fb765ec07ddad8979f0b90181e3a38ccdcc0526c54ff2f779f22c096 6f9bbdaf67c1bf4cc6452c452903c4f1bb477d95e7db488b70bbf9d35557daa6
+lib/codeql/rust/elements/RecordField.qll f325dcbe74e8a1743917767e5be9f3dfe7808864625bbc8aada1aa29e40e555d 84404fe7f3cef6d06a735c3424b9fe0af5cea5f8899b8685020a5d95285d4c23
+lib/codeql/rust/elements/RecordFieldList.qll f0c404eacf9d84541c1e5927c9cc950bb5737b0140e3dc8faec3958ac36d8494 105280c2dcc2282773c003426dc4d0caab69af6c8a4f0c84d6bf9647175782ec
+lib/codeql/rust/elements/RecordPat.qll 5995213f63b8417dc61a508d0c114a19a7c4c7822a058639bea4a3740bb4134b fe7b415e5e6cbbbb1069a42f2615a2f7af272d0456756292190fe69ff4b7d378
+lib/codeql/rust/elements/RecordPatField.qll ebf9e0fa41f73f9f2ff725276266c7e2a1e99bced7668ce1d28c4f0d358f31f4 7daa0f07fc401d4fe330f956fb91b301c1cbb48dd101c705902878ae346ed471
+lib/codeql/rust/elements/RecordPatFieldList.qll 0ac388e3087c8f8ec74cfb1a7894c67ebbe2e3d6849732e1ccbd54474fbbb6b0 544256e97a8ba62bfa2abfd07d605b8d0f06f9523880d15bb6ac3356493bc310
+lib/codeql/rust/elements/RefExpr.qll 4cf33802476335fff3c6c0ce4df43219818f53471c6502be3f9369718021c3ac 002a31b3061d3ed9124658462c81c5a7c8a9409a7af014daa4250b373d751b5a
+lib/codeql/rust/elements/RefPat.qll 5783a062439c2e13ba9b43665d8f837260fd2bdd4315afbe3c85f53519b3abb7 1e4087342089316d5130005f1299523452b3cd5678a8efa5c3dade910c3c5677
+lib/codeql/rust/elements/RefType.qll 77af5086784d3f926f668fe2004362b5ee3dc48a7c9a0c93e9a878bc574d10fd 2db6b4be3e8242d1e83d229d973633c791d52bb4cfcfc6edeb372d7d38be8098
+lib/codeql/rust/elements/Rename.qll 72fa505670ddcbbda8df58654e28804c48c24f37dea5b1370601fe6d0855ee90 9dee2aa1afc38eb8115f5fda5194089792245f5f0bae64be49fbdfdd9d29f912
+lib/codeql/rust/elements/RestPat.qll 0ba0d4a16637e11a21f6a1924ca1852b51bd28dbb76b3bd9f016532b51ba65dc f12c231eca1458e8d2c86e08918e6deeea449ad6d149dd89f744799976e6bb30
+lib/codeql/rust/elements/RetType.qll 316844bbbb7770312069ca3da2a0ad75977348381d9738aca8e9d0681d55e6af b12b716fa47ab309cee7adf16f01ae73542f83c0940d9087c036a1feaa163a53
+lib/codeql/rust/elements/ReturnExpr.qll edc21a9deb5df89220038eb94ae6b3df09d79818ba4096636cec28a06562af18 6f8ac4c34a462ad3308fae8e195140e46487227a373beca105801a9a0efb2a72
+lib/codeql/rust/elements/ReturnTypeSyntax.qll 8ee6a20cc7ba4f01926b889722970976747de47a6766cdd6f350db7fdf9b40e8 f8a855d11b1bb4270917367bcdd64f0ee671ed779ee83ca8223cbc218f09c7b7
+lib/codeql/rust/elements/SelfParam.qll 03db708c9949d709c2a09b9cbbca15ad6f9c640fbcc5dcced7573366ae0c5e7c f8ee8ed5c02bb277252198040a44202af578fd8fc80cd516e6e2199ca7eb1cd5
+lib/codeql/rust/elements/SlicePat.qll 750ce938c11b6061ddea387cbc2be6969f242869a50171778efbb5326c75eef9 8bed136b1bcb9f073009dd5ae27def6150e6f040510eb5e62079cfda30e9986a
+lib/codeql/rust/elements/SliceType.qll 57a29d8918276eef641d157f580158b0f408229184be5dda739e936dd1c92e5f 29e43cbafeec2ce116b0ea53af2384fd3f7bac51824e51e970f3386c28025baf
+lib/codeql/rust/elements/SourceFile.qll 73573ddd3882bcf42f23c582eddffafc31f30a96366db79b9a095215e40ac12b 10e7a199bf8ceb77b06cdf21526d11856ef09d2c472cc4342299b08d72017a55
+lib/codeql/rust/elements/Static.qll 402a0b6c116677449a2d57161de955d0a1d866a3f9010bca7895f8a4ffc37173 559a8242a83ff6c36ebf34df3c3c757d1b27637bd6dec5650aad8d33a51fe86e
+lib/codeql/rust/elements/Stmt.qll 8052f50d89e86ac2060d5178e6c72bbd0e18a5307263f97b0f1092d7b94c9300 31a3750eab488fc62558da8dd1c5fa727659d17835e538191fb2b87bd56c8d4f
+lib/codeql/rust/elements/StmtList.qll 93011b77781f85c95109f64d127e8af37bd9c3bae9715fa67a06d1e8afd50eb2 b9ebeb924d0c802475dc70dc0820e59fa9d409bb628d7cdbe598f4367a8d575b
+lib/codeql/rust/elements/Struct.qll 6275f19609d4932454d85c08a5fb53986af9911eac73d19eea0236af3ef41299 afbf88c44bdb3e52496a97bd76cb674d8f0d92339138c0337b1699320a2e23cd
+lib/codeql/rust/elements/TokenTree.qll 131b62731515e9bb5bf551aa53b311f436e4d3ca9df01a0db1206d5c3ce0e924 1c0cf19dfd03823716cad8ebd57c8246e6636fa501a48acc811f54e5738bd037
+lib/codeql/rust/elements/Trait.qll 5bbd2afcc25c6f1abf0268d653f1833179b3404491f85106fd169cefad8a5cb0 2572ae760fe70fa72d8c7b937a18c9830b1c664186c914e04b6fa5eeef95ff7a
+lib/codeql/rust/elements/TraitAlias.qll 749609802fcfaebd754b093de6970f42ecb39053ca2683d44f7f6e2e20b85792 530b45723b60405578d0ddbdd550096d5de60eaad293393fc4e50078bb92c5fc
+lib/codeql/rust/elements/TryExpr.qll 7a3104c8f02badc431dda4776514f6cd12884b2c7ab316eecbe63a687eb9cc5e 1bfb023569081ecbb9362a0ebb6e53901ed8985e95ab8dbd0e8a2458dcbcaedc
+lib/codeql/rust/elements/TupleExpr.qll ba254b60432e5e63b2e72fa0d0248eadf5b64dc70aae5bac45770750e4680227 88a55ac4a08864dd38f25bbafa08f79bed0972fc88a0241e46eda8f108074ea8
+lib/codeql/rust/elements/TupleField.qll 872e5122c7053f42fbf65bbf9b92bbb70caf90153f22588584565cd52a31fc80 1997f1a5fe7f6d5eb3c3b9bc9657a0211d7ecf97c29b5615b6841ba26284d501
+lib/codeql/rust/elements/TupleFieldList.qll 608f6f159f0496a908f9e18acd0423df80d4e33dc450a7c207de259cfb50a427 ecb6b3352d23057540e18da7c96e7b5511958b493cec420092661a5bf4683d57
+lib/codeql/rust/elements/TuplePat.qll 1cf4b405e1dd83b876ec269b37956931a85c776c958ac14a6c06cb765c0392fe 1e57b6a8b2445bb6b8e153c84e31386fdf95bf0e6b3735c176f1935c5c9ae41b
+lib/codeql/rust/elements/TupleStructPat.qll aa4970cd7d4b90167e2b23ab7d7a7bb23c21712bb8282023e08360d342b9ab04 2b1f4bb4521792cc641c6693e6dd91ab8a8832159a026fc0ca3b1d570f02e67b
+lib/codeql/rust/elements/TupleType.qll 10e651562ed9e2799494dc68b9ab5e9ab5b4834195be487c8f513e06ae4db8de 7b388841dcd090174d1f3b190553583fd82ffadd7591dd185e6770136c2685c0
+lib/codeql/rust/elements/Type.qll 36631eb36947f793b0c66be9c51423524638ed21c60f46c9d4b00bf145df79e0 7b6f345d6ca870db08fff6ffabcbfccceb3587e246eb8247d11eaceb41071516
+lib/codeql/rust/elements/TypeAlias.qll 42bc944063e15b042ed2d9673563252a416bdf25be2ee39d4dbfd78d9fcf2ded 25f815abb2f899e55ea294746f789509922656029edbc61bed7dd2583d968659
+lib/codeql/rust/elements/TypeArg.qll 1a3155cdad72b51a03a4131d718c9b957b509da48a76471a2ebd8a559e7de15c 4300ca2e01e1adf3ac8c8d38626b2a2be62ece83c8e1b81590a7da39e75e5d93
+lib/codeql/rust/elements/TypeBound.qll 2f094128e5b14eed4a6dfa1e2a274ab89b93987b59182ee3a17f63b332892d48 d3b9d654d88ff0039a4b2556f39156752135447abc60a4c269f637b4ac3e159a
+lib/codeql/rust/elements/TypeBoundList.qll b16ccaa927ff011c2cfda79d720874b734010cf4b2d73d5903b50a9e594ac618 a00003fada90852454bef3ee13ba38036ce5ce703f3efb3d4a47ae7bda51278c
+lib/codeql/rust/elements/TypeParam.qll 66e56f56a8535d620cda4b14c09b75a72399bf00e22efcf3af5c94492368c35d 8b85a2c9eac51ca06278db96e7b170a3a6187e32580bf7e07801b95dfca9e73a
+lib/codeql/rust/elements/UnderscoreExpr.qll 4915102f13f4a800e5191c93456d787d8329d455a2fa314c89dbea67a3277483 aef9865547c4ac8c50c9facec145f84b3151395d3f4bc048b7acef549efbb3d7
 lib/codeql/rust/elements/Unextracted.qll 12e60c79ef5b94d72b579b19970622e7b73822ebc13fbcfedfe953527ab1ac36 ec015db2eb12c3c82693ddc71d32d9ab9ef7a958e741e2510681bb707ceca23e
 lib/codeql/rust/elements/Unimplemented.qll bf624d28163e5c99accda16c0c99f938bec4a3b1b920a463e86fc8529ff5ff02 013bc7777298d250338f835cd494b5a8accea2d6a4f9561851f283ac129a446b
-lib/codeql/rust/elements/UnimplementedDeclaration.qll db5b6a5fcaf9e2bf02e4f22a515d2753451fe6c5a2c3cd0f246f2c2fe3bae5fc 1f39abe96b47b3669d427b36a5ca8c742cad4843c6a0da34f2e6ad2b71492a44
-lib/codeql/rust/elements/UnsafeBlockExpr.qll 307f0eade3c7c0e180bb3e8c1c556d05c921bce90b325ffc6f6e88fe5ddc0395 e07e34741519e3478feda90caef66bd463f74f1338e8b28dbebcc8884c75069b
-lib/codeql/rust/elements/WildcardPat.qll 807a1a45cb1dd64b660a5c553f59a7f85c53bc86de05f7f7c59037a14d785f53 99e07b55935057fcfa16d33b1d9b38cafd191259bd6dd9e33a58496d127c6116
-lib/codeql/rust/elements/YeetExpr.qll 8258022103032db57a6f21fd2b84b0fe0bd49cff6a02775ee263c2695dee03ac 633ca99bb43a47f35e1a631df8de4c6b489bd61ec677852e746bc2e0fd97763e
-lib/codeql/rust/elements/YieldExpr.qll 8ce7e459cdff6ce6e9aef3e8b924d90d486bdc270436cec0c80ce18caeaf9f2d bb557da11449116804156479e4844168fd1e25aec703164a3feeb08508d3f959
-lib/codeql/rust/elements/internal/ArrayExprImpl.qll 4de60aeec139bd0c7a1e6f7a681a346da18d52ea68b733701a2e58dd242da8fb cb22e5af3369164993d952efc2a0441aee342d1204a710e6b4b0a8ccea0cd757
+lib/codeql/rust/elements/Union.qll 6f529455533402866c7372422390bb183f591e3743ee92f7c5aeafe9dccd811a 44bb90bc65c472e06fe5b5dacadcf0322be35687bb256f08cc01e5496628f827
+lib/codeql/rust/elements/Use.qll 2ccbe4d86f0f97a9501fdc4a7011b13c2a3ab8e1dae4f8c1fba3d8268aa8f5e9 4d5a2b54de9cd3b7e78f67006f98a9a8facaf99973be1cb3a41538291568a9b5
+lib/codeql/rust/elements/UseTree.qll 9ec06bb5cee8f13914bb436dfbceef492ebe2d9e418b1d2840053b9f395d6ccf 6c3c44b327999a33354a92eda9f39139eef17caa0d66e2c885200d16f3514ef2
+lib/codeql/rust/elements/UseTreeList.qll 3565bafac972718c7f4e9a4dfdf425b1a8fe287aa388d304554b6fc92041a33b 1a7633793396e8b4f7f6ad938bc884c7042f6de502d8aa5e4a00f82861e92b64
+lib/codeql/rust/elements/Variant.qll dea7dd466b1d13367b95d88b1c620b4d9b93013b650a4f8b9d8822e285a26265 a815cad992799817a2271f3f38f8400a79927b36c345ccddee545f695af1563e
+lib/codeql/rust/elements/VariantList.qll 58f71425def05356ace4b0aaf74af3002fb8b95ae750eb559addc68fef0e2ea4 56db2366a1c604ad9e48f337169541a01289d4cfb9a3a7b55fd33af2eef67a08
+lib/codeql/rust/elements/Visibility.qll 787dd6a8eda02e41210210cf5c2282bdfb9bc3349e32532ecace66b8e6baca07 b3600d5ad4c05b10ee64ac767a1b647d653a8e79bd217991da09e93e9753a5b3
+lib/codeql/rust/elements/WhereClause.qll 82436d4fb7f1981b06ab5cd3fa18525278236876c2af5eb5c8ced5bd1ed2fc2e 4ecdab4660648909d890edab0d6f9821ccb50d20c7b92eb7f0a8df112396bd8f
+lib/codeql/rust/elements/WherePred.qll c01a949f04fd3fd7f1edaca237149b3bf09a84c1674ef2e8b24e61d7f850258e ec80e42a323aab2db7f8b6942bbb88d721a80c88c284a402ffcbde14defca062
+lib/codeql/rust/elements/WhileExpr.qll a40ac60e328f4dbd09eba101026ea8d3b33656e97462818c98616896f8e67adc 9864b147fddfb118fb00b6bbfede2fc2563db326b14df28c425e38c239333986
+lib/codeql/rust/elements/WildcardPat.qll b9697f41321ce33898888e95885973f0c510e152ef218fc2956d5e9c53710f5a 49112c667060275bbf5a1d579a62f8227d423bb2e3b9d447873d52b205aa1e12
+lib/codeql/rust/elements/YeetExpr.qll 07f328b342e46be198559269fe4866609bbbd4a4149fcbe5a1bbff88bb87b8ed 8af886ca1fba3718a591d175073cf1bfe289daec42d095f70bdf91ea7b987210
+lib/codeql/rust/elements/YieldExpr.qll f79310809d5f5aa569e60ca348f140294d38f02556e94b64a1ff11bd8fcfbd07 8ceb3f710aacaa9ec12e5a0071868aaeb2588997525a02ae6ba9b4c8dbbf67cf
+lib/codeql/rust/elements/internal/AbiConstructor.qll 4484538db49d7c1d31c139f0f21879fceb48d00416e24499a1d4b1337b4141ac 460818e397f2a1a8f2e5466d9551698b0e569d4640fcb87de6c4268a519b3da1
+lib/codeql/rust/elements/internal/AbiImpl.qll 9dc7a7fcfc6ded40f8bf9a1e242eaba1cac5f223bfd306d422604f0485a2df5b 9e4316b613d11f34a15f1d662d6574cc71eece4692a60d92201e636a9ec97f18
+lib/codeql/rust/elements/internal/AdtImpl.qll 78664ef8447488c34870fa40ce23c4d0d25230dff3a3a419f7f41db11cfb2c88 0048099c53495b24aa6dd3ec6fb3aecefe725005f19017e06bf93838a152805b
+lib/codeql/rust/elements/internal/ArgListConstructor.qll a73685c8792ae23a2d628e7357658efb3f6e34006ff6e9661863ef116ec0b015 0bee572a046e8dfc031b1216d729843991519d94ae66280f5e795d20aea07a22
+lib/codeql/rust/elements/internal/ArgListImpl.qll 604b71b8fe35ebdefeff01aea16103e27f2ec62d6a477dfd2891522155d70db2 7b4e7189a16a2b4689c6958dc00eac25fbd15a43ca6bed6fb90e4f71829fa361
+lib/codeql/rust/elements/internal/ArrayExprConstructor.qll f4ac4efefe5fe4fe1e666f35b1ee92d2243d977b3f3308151c89f61582203c09 4167ae58ec869f7dbd8467093c4a53afd7c1efcf1cc865efa62b4eb484bd7ff8
+lib/codeql/rust/elements/internal/ArrayExprImpl.qll a4f2eea902e859646823be9ee5e30032862901a581b896c1bac17ecc02e5e8bd ce1ae9bb034841987604f4a0792445e5cbabfa8b74a37e7062a4bcc80425e040
+lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll 9e92e6c40df992b4d71ae0e80392e81499604c7586a671b89d31d2d98060380e 76a1915a88f50ffa60bf129237bae2d66cf26d2a9018aca8ccb343929e847531
+lib/codeql/rust/elements/internal/ArrayTypeImpl.qll aca3bd1b98bc924eaf145c48e5134cc2867ff2a5aa480fd8d98df6c3bca69847 199681b92757ef1302ce941649661f1a53d8afb98b68d54cb9d724692a289f6e
 lib/codeql/rust/elements/internal/AsmExprConstructor.qll 36c68023b58beec30af9f05d9d902a4c49faa0206b5528d6aad494a91da07941 4d91b7d30def03e634b92c0d7b99b47c3aadd75f4499f425b80355bc775ea5b6
-lib/codeql/rust/elements/internal/AsmExprImpl.qll 14e1648fd6988e04fc4d05c31166dc2a91c37bb561241c5128b3c917780d71ed dbb35b143b43df2c47b882e3141baaee2c3eb21db5c549e86b6310d36803e9c9
+lib/codeql/rust/elements/internal/AsmExprImpl.qll 6d782d415c15bb7e28163a3fbc4fea36ee8bf7c1318b1cc1081af968f86c7e56 279028e7a44d02fb991d8219eb6f01cb5cdf46501798f9ffc61341a3834a040f
+lib/codeql/rust/elements/internal/AssocItemImpl.qll 77463fc2a0675063d79169d5e8f7cfc17d978067248dbfe8307a2d7891aa1122 ccb5c62f76a556fbd0c851e325109de19e007ab841cf88911c2d7049680c3cd1
+lib/codeql/rust/elements/internal/AssocItemListConstructor.qll 1977164a68d52707ddee2f16e4d5a3de07280864510648750016010baec61637 bb750f1a016b42a32583b423655279e967be5def66f6b68c5018ec1e022e25e1
+lib/codeql/rust/elements/internal/AssocItemListImpl.qll 426d360e1fe939b411fe458ceb7d78171957a747c4227a126bdfcdc56825e666 99f76d71da72133f9ff154c7c71cbff02d566437cbe8ccbae964fa91c02e8cdc
+lib/codeql/rust/elements/internal/AssocTypeArgConstructor.qll 58b4ac5a532e55d71f77a5af8eadaf7ba53a8715c398f48285dac1db3a6c87a3 f0d889f32d9ea7bd633b495df014e39af24454608253200c05721022948bd856
+lib/codeql/rust/elements/internal/AssocTypeArgImpl.qll 385fa23ee3378935b17bffd82a626cf8023af8941d55e06bbc3f52120608a5e0 9804b7a395a6672c30438044de7b7ec8766e26616b427968dc1868d9dc80fdb5
 lib/codeql/rust/elements/internal/AstNodeImpl.qll 76446505990a4018cad1e70b1e8f3b819a18fa77b3411789fa8853dc9d439580 234e2a6a20abbf146807f7136dcb44ffeab5ca891b192a816a36222562805e66
-lib/codeql/rust/elements/internal/AsyncBlockExprConstructor.qll 3db7d71723925f407d36812134ef8f9440f6755714d4c5d3c82bb2b771d00f71 6709690b5da048dfd2213a704d438af0a02b69b30d48fb85668ae470ec000fb1
-lib/codeql/rust/elements/internal/AsyncBlockExprImpl.qll d61077be2bab4fb547978cc5e841c8281957d279e3e9699512443562b9b43e0c e98555ffe54c3bc253421b83949a6a7c482d7ba1a82a6226f580325f9aa14f3f
+lib/codeql/rust/elements/internal/AttrConstructor.qll de1dd30692635810277430291ba3889a456344dbd25938d9f8289ab22506d5cd 57b62b2b07dee4a9daeed241e0b4514ba36fd5ec0abb089869a4d5b2c79d6e72
+lib/codeql/rust/elements/internal/AttrImpl.qll 1232481cd7cad3be3018e8083ebd82adabdf89df187613a648ca1a6020fb8af9 1b1eb8115b9fd9a449686e7ddbabefed3b9b14f15677c651a52efbf13f385db1
 lib/codeql/rust/elements/internal/AwaitExprConstructor.qll 44ff1653e73d5b9f6885c0a200b45175bb8f2ceb8942c0816520976c74f1fc77 11e6f4a1e1462a59e2652925c8bd6663e0346c311c0b60ebe80daa3b55b268b0
-lib/codeql/rust/elements/internal/AwaitExprImpl.qll 7c39ac834daa6f6ee005f961a5d47915e24d111f31b808970f39bcb6db3dcbd2 2dc7bf51c9cc7ebd2d88320f1d035c349a983fbf1b1273a2a3d129be470369ce
+lib/codeql/rust/elements/internal/AwaitExprImpl.qll 03589acdee250f62b35005b87ea6d25ba8a739a27f6f74e60cd114e10e435311 b9b111a16a9857946efbdcb0b143b05bbafbc4048720a3979df0bff552a91700
 lib/codeql/rust/elements/internal/BecomeExprConstructor.qll ba073aaa256cb8827a0307c3128d50f62b11aac0b1f324e48c95f30351a9b942 3a787ded505c3158fa4f4923f66e8ecdcb7b5f86f27f64c5412dc32dca031f18
-lib/codeql/rust/elements/internal/BecomeExprImpl.qll 8e191ed24d20e19950e349bdcba16ee23421dfffaf2fcf6e3975e13c0b5de18f fed23dd5129989675ac28ca2e9707de1f4daef9453e9e399183158f007474ddd
+lib/codeql/rust/elements/internal/BecomeExprImpl.qll b81bd325cff5cc8658421e1b104c75cfd54b64195718e8781c3ccfaae842ce9a 48d69bf28aa91ee472b440fd68f72a310c67b43f4259390d36e8e3d5c680180a
 lib/codeql/rust/elements/internal/BinaryExprConstructor.qll 7f9b17757f78b9fb7c46e21d2040a77fa50083bef4911c8464991c3d1ad91d87 a59390cd8e896c0bfbdc9ba0674e06d980ffcefa710fbc9886be52ed427e9717
-lib/codeql/rust/elements/internal/BinaryExprImpl.qll 58f18b1fa3f4ea4e3ca82b022e24f11a8b847bfb8060a6fcb47e5669cbd3ad52 ae0a772db2fc83d93a1dc794cb4ee67ee8fc40ccbb83ca3abf42da43d107b7b0
-lib/codeql/rust/elements/internal/BlockExprBaseImpl.qll d2976ca0e6942d8da5535b5805cce9e0c2400fd3d27ecaf4742c574c40e69a4d ab4b2a83311fb1f0f27b1d6ae90c63e1e7fd686458eb8c5a0c46b6bc1ccd852a
+lib/codeql/rust/elements/internal/BinaryExprImpl.qll a320bb2e68392ce6fe4dcf33b3cdda5a90d2d664bc8d9884b2582aa063dec991 d25b08d4a55b3f17f93ee7a1d6a6ea178380f1a0a26b4770a2d8665e9671d66d
 lib/codeql/rust/elements/internal/BlockExprConstructor.qll 438337c807645e98a01440f3f4610d68b0567ba15c8f51dc43bf5a30c9af3696 48ce7a546910c884619762349b8ada9836284f8008298fdb0070a38f7ddf25a0
-lib/codeql/rust/elements/internal/BlockExprImpl.qll 1243ce8ec82f470eb0adf9a7c88639bd07c039d659612d272cfc4efd79abaf67 0d0cdc216d5408d2f0dc9432aa84f77206edff8aa39b11c554d62c5385c8f0c8
-lib/codeql/rust/elements/internal/BoxExprConstructor.qll 4182e3126c196f3e22bc3b2012d01a9dcb464e0a0939e56a1bb410f5caab28c7 6ea2c688292b8b4b60a99f5340726fda955d97b78b801655145841e361c87ea9
-lib/codeql/rust/elements/internal/BoxExprImpl.qll 4f0921489d6eb8b5d66180bfa00de51b047957a1cfea5843e1c636142a699555 13a589e302ff42a3ab47be0c4c1ded9de63b3d39c909ec95624d98fd0b52d625
+lib/codeql/rust/elements/internal/BlockExprImpl.qll 4c22d91a26f47defc6057cb71020fb4b1cf8b3b126a5d619528fd88f4152b7cd 50d5ffa94c98b7a540143bb5d31885dc8b88b298b887b582516ad425c60eda2b
 lib/codeql/rust/elements/internal/BoxPatConstructor.qll 153f110ba25fd6c889092bfd16f73bb610fa60d6e0c8965d5f44d2446fcd48a2 9324cf0d8aa29945551bf8ab64801d598f57aab8cd4e19bcd4e9ef8a4a4e06eb
-lib/codeql/rust/elements/internal/BoxPatImpl.qll 8cf9104790337e30b5047e4ae5c10d49bfb8655fb17eda88d20c7ac870e2b9d8 93d965d08072fea8a24fdf30cff61d4499aca461017ed483d2ba12d9841fa88d
+lib/codeql/rust/elements/internal/BoxPatImpl.qll c4906d968a5223e87332c63e6bcfd7f826955f2525d984946988dde9c8d23589 2532ed6d43abd11c9684ed739d41fa32ab1ae5cf1a1fe33f0ff742d8d5550ee6
 lib/codeql/rust/elements/internal/BreakExprConstructor.qll 356be043c28e0b34fdf925a119c945632ee883c6f5ebb9a27003c6a8d250afd9 bb77e66b04bb9489340e7506931559b94285c6904b6f9d2f83b214cba4f3cfd5
-lib/codeql/rust/elements/internal/BreakExprImpl.qll c618d2e145b61fe93c80d532c3806464621aff425035f01e74dcc8c36d7c666e 2089705b2c2d4848acc48c2ffca6d76d42fb033b3b64ff9c28211c4d7b375229
+lib/codeql/rust/elements/internal/BreakExprImpl.qll fff93db12b562458782368eeec53f94f9ccb0fa384c1370a23ef0350d8ca11ae 74f8a0eb820f369f575de6ccf5a099a363369f877daba320af751629a007f5e3
 lib/codeql/rust/elements/internal/CallExprConstructor.qll 742b38e862e2cf82fd1ecc4d4fc5b4782a9c7c07f031452b2bae7aa59d5aa13a cad6e0a8be21d91b20ac2ec16cab9c30eae810b452c0f1992ed87d5c7f4144dc
-lib/codeql/rust/elements/internal/CallExprImpl.qll 803bc51e97f64d342bb990accfe14f74189a49cdae52676b0954ea292bcd0264 deae36e3d1e5aab47d9cee9e1f44d0a852f9f6e91af79688473aba03612a01c7
+lib/codeql/rust/elements/internal/CallExprImpl.qll eea69291c85b6e7503806d10a3a7556572144d6973072f29302e60ba141cedc7 cc037677f9b7cd142447f212537d5c71a58ec4c5931a08bdf4ee92e722d98e81
 lib/codeql/rust/elements/internal/CastExprConstructor.qll f3d6e10c4731f38a384675aeab3fba47d17b9e15648293787092bb3247ed808d d738a7751dbadb70aa1dcffcf8af7fa61d4cf8029798369a7e8620013afff4ed
-lib/codeql/rust/elements/internal/CastExprImpl.qll 8613f33dc97828726dcf72c98a68656806a77da34393e430553d6b948a52ea9e eeb71ee9fa60f65481fb1f2ae7137c1b54c7661134884a8727b63b06d9898d8d
+lib/codeql/rust/elements/internal/CastExprImpl.qll 77b5f7d1ddb8f94bfe5b56cc0890a2f143190924639f7a5e561e194bcd9279cf fd11cc83473c034dc799ea297d33bfe8948a63d9b0f9439cfddee818adcedcd2
+lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll 6e376ab9d40308e95bcdaf1cc892472c92099d477720192cd382d2c4e0d9c8a1 60a0efe50203ad5bb97bdfc06d602182edcc48ac9670f2d27a9675bd9fd8e19f
+lib/codeql/rust/elements/internal/ClosureBinderImpl.qll 86de0c037bde046caee2d98f77778b12891a03963da78799d6978e4edb525e96 c4d31fc1d925d8a90c107a68eacb676dee1f5a4fa8aef8d232832e661fc92305
 lib/codeql/rust/elements/internal/ClosureExprConstructor.qll a348229d2b25c7ebd43b58461830b7915e92d31ae83436ec831e0c4873f6218a 70a1d2ac33db3ac4da5826b0e8628f2f29a8f9cdfd8e4fd0e488d90ce0031a38
-lib/codeql/rust/elements/internal/ClosureExprImpl.qll 8549c42f7a39e0d6744c2e61012d512ca9525f78676ad1d09b3e45a95ae4cc55 23f7ea3b72d72d89b6ea324c2a82439fbf4ff496f73bd88c5c437360aa662e0f
+lib/codeql/rust/elements/internal/ClosureExprImpl.qll 9196827a41858c176240203e052f13c623ad0fa5e0e29384ddc02acf1a4b37dd 534415f73f7cda684a32cff477854925237d63bcc724f3cb75fa106a76eae14a
+lib/codeql/rust/elements/internal/ConstArgConstructor.qll f63021dc1ca2276786da3a981d06c18d7a360b5e75c08bca5d1afece4f7c4a83 487a870cbf5ed6554d671a8e159edd9261d853eba2d28ce2bd459759f47f11f2
+lib/codeql/rust/elements/internal/ConstArgImpl.qll 55ced0d4099d123deb9dbe88d57bb548d74c329c5d6488ff37d0b77c20b14b12 e99494d09a0007db0b9814a3ee3b77912e0d90f87f7c5476c2eec50ca87041c2
 lib/codeql/rust/elements/internal/ConstBlockPatConstructor.qll ddb4a0045635d477e87360ecafec0ba90ddcffc6e62996eb6e7edd5a5d65b860 442061d0497a615b3f008b990f5e3c4f045110f76500eff81a7f44ffd1319acf
-lib/codeql/rust/elements/internal/ConstBlockPatImpl.qll 0bb0f1d97a8dc317c17825269ac6350c9b074c7d8925d02312c37f00cbe37a2f ee9296bf3b96ef717d01708c71c7ecd4bfdea8d05af38b0e28641694708e66f7
-lib/codeql/rust/elements/internal/ConstExprConstructor.qll deab07cdbf15ba3efa95e4b429871d10a9202809745e079ba73b6138a31cfe45 803aedfb3e1a16e39f736192a70fda47c511ea39942fd323a00109215f1a0b5d
-lib/codeql/rust/elements/internal/ConstExprImpl.qll e9e4e375a7382bafd66115186deb85c9a28f39c1629352ff18c47dc493271963 cb5dd691c2ec91f1dabe6dd2ed6e3f97396983f6559ebf6e53feaafa32a4c699
+lib/codeql/rust/elements/internal/ConstBlockPatImpl.qll d178f48169eb49d0cc626dde4fd323edca706046a33971e08728cd3426ac807e 5fadf931f08b99561710e17b4a77e9d9ea163b776af2588f4b2396024834de42
+lib/codeql/rust/elements/internal/ConstConstructor.qll 72a31fd9b8b3fd910e35af1b2b30fa54cc4d9e14e7eabdb94b4cd2af95b2df38 3edc0a82a7b446fdfd3e71947801f3c7cac010b2a217b8accb69980387bdd67a
+lib/codeql/rust/elements/internal/ConstImpl.qll 850f68856be529df21c98c2d2bd8aae20f165dce0e8549ddf4fefaf974f64e64 86e513d4be1e2688e52f20ef79340228ceeaaa42adedf429bf1a13e45454c69b
+lib/codeql/rust/elements/internal/ConstParamConstructor.qll f6645f952aac87c7e00e5e9661275312a1df47172088b4de6b5a253d5c4ed048 eda737470a7b89cf6a02715c9147d074041d6d00fd50d5b2d70266add6e4b571
+lib/codeql/rust/elements/internal/ConstParamImpl.qll 9bc4a79a98b990dada2d281a00ab6b76ac203c256116414e423e2d2184bba6d0 e7319f3b552ba903092a9e46d3c9d621b916d13a7364ef2a32cc6ce2cf63bb0d
 lib/codeql/rust/elements/internal/ContinueExprConstructor.qll cd93f1b35ccdb031d7e8deba92f6a76187f6009c454f3ea07e89ba459de57ca6 6f658e7d580c4c9068b01d6dd6f72888b8800860668a6653f8c3b27dc9996935
-lib/codeql/rust/elements/internal/ContinueExprImpl.qll 4903b599e979553b855131d44a73c8e5c9330396abe98ed1bee1a07c5afec8b8 518a2d4a4835b83eebccf99f5eb21c96b1e367d7536829dcf2e5eddcb5819b6d
-lib/codeql/rust/elements/internal/DeclarationImpl.qll e60951aa6fc1f39be52cf782a1413f04c132b890f61569286777936ac0926b23 b41b1d43214a461661f18bbb734ce6e257c5c8cf9d156424d401241d47fa2153
-lib/codeql/rust/elements/internal/ElementListExprConstructor.qll eafdb6ae921a73263d43702e895aed73e1e7b770871216835904f83c63c3d2e8 1443b028d4e32d74ee9f0756cae65e18851ee7ccd7dbd933b42096b52f6fe8c6
-lib/codeql/rust/elements/internal/ElementListExprImpl.qll 75457df04f370391aa1c266cb13615d85c8bd5eaa8d606e0a41ba794828d4cd9 c1ee77872fe928f1a77c94907bce14a1ecc4be04c0652432a6f90ac2c14ddb0b
-lib/codeql/rust/elements/internal/ExprImpl.qll ab20ee174e2e786f34af6e5dedf3ec071bb89fc266b3e91df6377f72aa38d3f2 f68192700f449bf1c229cfbaabd5353c7c559941c915d5a0c88752cf9844194b
+lib/codeql/rust/elements/internal/ContinueExprImpl.qll 611f38d558c98806e8b325611c24d137453bdb90e16254db5bbd944fa11ad666 2a968b7bfadf10317aa929c7476b07685127ca63dba782f5aea2467551b2d73e
+lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll 2bfd81fdf116b76f4a62b47bed5f0a730c04ce79747ecd1d3b683b8de22ff4aa 375c57350c432351396b92f28fded1e95a8002e3a1b31f3b66039f9b3d9bdea9
+lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll c8cd31bcd5ef0cb6212fa87d1e03d44fbb97721d8a94583cbf0265b7e8918be3 74f55ff9a8d97f1218f62ad1a636ae7605b5643e3f69f3c58a429873f4b37f2e
+lib/codeql/rust/elements/internal/EnumConstructor.qll eca1a13937faacb1db50e4cf69d175f992f2204a5aaed9144bb6f3cb63814ac5 1bafba78b2729fdb052a25a1ba3f4f70871564aa4df632b4a1d467858a437924
+lib/codeql/rust/elements/internal/EnumImpl.qll 9f5292cd1be251a2833a11be902b664a45a4b798c0d1c164058ff0753e17763f cf24a430ea5e8a197a6c084a7d938d4d1513df5fe22272f1d25a7e4ffd94473a
+lib/codeql/rust/elements/internal/ExprImpl.qll e8432a70b391b4211ecf6f3a616cc880ac7e12a3a2162976654b22ef81ee80e5 f99ce6e274b22c339ddb4f7dee40a82f83002c74d4de925f9b5fcef70f89a531
 lib/codeql/rust/elements/internal/ExprStmtConstructor.qll dd6bb06a7d48c12f630aafd611621cc50ce0f3e7d9abba5484a695f90879264b dc8b6ec8acc314e041ae71868803630c5d4cab488c72c1ea929bb756e1847c52
-lib/codeql/rust/elements/internal/ExprStmtImpl.qll dac89645c0f2cd23ed8e9bbd18a00e6ab176a482c01cf6f02fd8c2a68d222de1 51c9ad1290b5896e68ef89b517186c4f1e1bb1ea60f663b61ada0b440b960741
+lib/codeql/rust/elements/internal/ExprStmtImpl.qll eae3cc48d6b0d2e9197b705897a98d7315cbf8b9c1df75ccafdcd10edb16b132 5003f6eb1b637769f06c6bb9c0c57e1c2de281517486c2f0f25f315bb232485a
+lib/codeql/rust/elements/internal/ExternBlockConstructor.qll 884bafd1cb5a6ce9f54a7a6b9ba1c8814f38e3baf69a2ff8cfc8b02163204b9d ee26e070fcbfd730bbfaf0502d5ed54110c25f84e7b65948c8638a314b67ea5d
+lib/codeql/rust/elements/internal/ExternBlockImpl.qll 6a75af33b235efc8fde1b40afc187fb8d731d738f3a654160ca88b4f35840a6c 153f5cc8ee93566919686afd17dd372bd4c968189f62c41d0291cb4810654d8c
+lib/codeql/rust/elements/internal/ExternCrateConstructor.qll edd4d69ca7e36bd8389a96eac4ce04d9dd3857b0470b9f24319312469b0f8654 c80f4968e675f4b29e92a2fd8783f800823cc855ad193fee64869d5ba244d949
+lib/codeql/rust/elements/internal/ExternCrateImpl.qll 8d5bdabc0550d48a12d937dd78ea3c393a72d236a8a736122dbfe7d98f760ea0 3258e2ac6f7fdd4b3643387566abc67836a1f4fda03c994ba47f254a085ebfbb
+lib/codeql/rust/elements/internal/ExternItemImpl.qll c83d31fb59f7692338f4988f258c9404201543baf04a015f276f5b1523942108 535786da1d57aa375913f13926ec2a28b26aaec00ccd2a0dee5fb107b0af5cc5
+lib/codeql/rust/elements/internal/ExternItemListConstructor.qll 9e4f6a036707c848c0553119272fd2b11c1740dd9910a626a9a0cf68a55b249b efde86b18bd419154fb5b6d28790a14ea989b317d84b5c1ddbdfb29c6924fd86
+lib/codeql/rust/elements/internal/ExternItemListImpl.qll 97f43aa548ce8c1da9b0b60509f8ed2ea5b99194b541460dc836351a62917db2 21865267852bfeff98ff439816f0cbd0711c974606a132d128648e477bffb98d
 lib/codeql/rust/elements/internal/FieldExprConstructor.qll b3be2c4ccaf2c8a1283f3d5349d7f4f49f87b35e310ef33491023c5ab6f3abc5 645d0d4073b032f6b7284fc36a10a6ec85596fb95c68f30c09504f2c5a6f789f
-lib/codeql/rust/elements/internal/FieldExprImpl.qll 755da0544539b48b932de9b763e0d1b75e9b3743bc7df145569b422a5c02d64c 1e251d49ce857d2fc8b318434ccf376f71491a1ba73e06f1e9209cc8c9760b6b
-lib/codeql/rust/elements/internal/FunctionConstructor.qll b50aea579938d03745dfbd8b5fa8498f7f83b967369f63d6875510e09ab7f5d2 19cca32aeaecaf9debc27329e8c39ecec69464bb1d89d7b09908a1d73a8d92a2
+lib/codeql/rust/elements/internal/FieldExprImpl.qll 38cc95d81547f7f1676a21cec91e3dd701a14b902c340fb2e166935842255424 181d0175b7a86c14281aac12b24191435d25170ffc544c189decf5e9ebb87d2b
+lib/codeql/rust/elements/internal/FieldListImpl.qll 421c9939413f0ac258d0b02eadce508bb0af85e3ab23d7807d948dc17855df74 2d337c3daf02987f5f4daf519eda42371b04646a79a60d9ff520107fc79c9afa
+lib/codeql/rust/elements/internal/FnConstructor.qll e1ca7e2bf22695c21aed4029a3103ea079fc619518e2e836d315c24d23a97dda 4fe1f5f2ce5d4ac40a23e2f0e25128ab54bda75f1db5125b30c1cbc1470fef11
+lib/codeql/rust/elements/internal/FnImpl.qll 56a1b0ec1cc50535fd6e64b8c9bca7bc728d22226d6fdce84773cc9b4496007e a1f96fe0c09ac4f9d14ea5729088cbf048ba95927b38111338c564cbb438539a
+lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll 494c53ee599039c02145f91394d8dfe7635b32d03f9fcde5efcc99ced437fec8 992462b1b6b9e64b6201f3c6c232ca524f126efcb562c9f0c176677bb559f33c
+lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll c84bbcf6dd357437f581e757ea38c1b51597d930af3158cdb433b93fcb8f82a9 9fd9f8caedeb34a1a0653105dd19f1b9f2e680a6a4d39a87e529386b6dfb1dfe
+lib/codeql/rust/elements/internal/ForExprConstructor.qll d79b88dac19256300b758ba0f37ce3f07e9f848d6ae0c1fdb87bd348e760aa3e 62123b11858293429aa609ea77d2f45cb8c8eebae80a1d81da6f3ad7d1dbc19b
+lib/codeql/rust/elements/internal/ForExprImpl.qll 22d3691767e39078c55fc9b04e03efbda396d3b7a3546e5d12bfeb3e3ddae596 67c9985110b33c1fc0f60a374c22074fc6504d64fe9f08e1f31ed8fdfff4496c
+lib/codeql/rust/elements/internal/ForTypeConstructor.qll 32c40b78aded314b5f51af904bfbd5ae4f1f0ea65854dd6249983cc26b8601bc 729069d58fac648a4b212b0068fb6bca348443b502c38978f171a7539b24333f
+lib/codeql/rust/elements/internal/ForTypeImpl.qll faea4adbf9f0ed112ee31a6fcc0863e798faa6cc360f7a155351de7404640ff2 9d392417fd89df25fe0b409297cc62216e8925fa0eddbca4d52d89da2d27a8e0
+lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll 8bd9b4e035ef8adeb3ac510dd68043934c0140facb933be1f240096d01cdfa11 74e9d3bbd8882ae59a7e88935d468e0a90a6529a4e2af6a3d83e93944470f0ee
+lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll b45f1f41331db8f64c6ad8c5146fd205b6dee4e893c30f209bad915d0210a4ee 2cf2cdd07298e40ff2559565a06ef14b8cba7d5c3bc5bcaa543edc35ce084e3b
+lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll ce29ff5a839b885b1ab7a02d6a381ae474ab1be3e6ee7dcfd7595bdf28e4b558 63bf957426871905a51ea319662a59e38104c197a1024360aca364dc145b11e8
+lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll 8149089bb0768cdd610e3ef1d82a9f091256e2b02bd0e7235de7d4b1c6dc3564 feeda8df1258b547c8555e18dcef4370cdc82554c9661c204817a2171dde4377
+lib/codeql/rust/elements/internal/GenericArgImpl.qll ae15f5c58d34903bca90d1fef153c2f74c9f1810651a9dfe20eae58a3d1e44fe dff3231fb1a2693de2e051224bcc60b8a6dc82a3a827129b7f48e42fa0ae19a8
 lib/codeql/rust/elements/internal/GenericArgListConstructor.qll 46859bb3eb09d77987a18642d65ba2e13471a4dc9c0a83a192fddc82e37c335c 2c7d54c876269a88d3461b05745e73b06532b1616cae9b614ac94b28735d8fc4
-lib/codeql/rust/elements/internal/GenericArgListImpl.qll e82379efbaf04080dcea4dca6f8c43534920b6e7e20151d5ede0fe1984bdfe09 44567d58909bbed41bba6503cd8e57289eb90819ecea796555d33cec06ee5a93
+lib/codeql/rust/elements/internal/GenericArgListImpl.qll 96eb20d511db423ff711836fdffc4a49f02f746716c691c4cd684128f4d03f31 4484db1ff89f67465514e9ccee5ab663741ad5c1706982fd20fa1a6e3eace746
+lib/codeql/rust/elements/internal/GenericParamImpl.qll ac0a1524ab2a190af5cb6940a97d9f4d3b234e0e055d2efc54da3192b772c215 0c8727ac009069d7e192f6068b69abca51fb276629bf9bbfdaf534e7f406e959
+lib/codeql/rust/elements/internal/GenericParamListConstructor.qll 7221146d1724e0add3a8e70e0e46670142589eb7143425e1871ac4358a8c8bdb 2fbb7576444d6b2da6164245e2660d592d276ae2c1ca9f2bda5656b1c5c0a73a
+lib/codeql/rust/elements/internal/GenericParamListImpl.qll 39666ec454d49c64a326e822f4bea9c75e4758e9f3069295d1d08af9ad0a0db4 eb40f0901ba35d460388669dca564b441714b3d662a0af1d3048336f74cb5bc5
 lib/codeql/rust/elements/internal/IdentPatConstructor.qll 09792f5a070996b65f095dc6b1b9e0fb096a56648eed26c0643c59f82377cab0 0bb1a9fcdc62b5197aef3dd6e0ea4d679dde10d5be54b57b5209727ba66e078b
-lib/codeql/rust/elements/internal/IdentPatImpl.qll 54ff3551fdae6643b7805e685c1c34bdbb7f75cc07f4e7376c94d4e017c3d182 5e20a72d02c610c8c47e71f142c1620628b67945541f2e161c6dddcab0c99631
+lib/codeql/rust/elements/internal/IdentPatImpl.qll 6e53a323967756e0e0f2197ef8998d9c8a91ef424bb86ba27305f8b1ac5f30e3 7866779a0c24ac3fba74924ac96be93af4f3fe2b5f9d12a58367204ade8f21c7
 lib/codeql/rust/elements/internal/IfExprConstructor.qll 03088b54c8fa623f93a5b5a7eb896f680e8b0e9025488157a02c48aaebc6ad56 906f916c3690d0721a31dd31b302dcdcec4233bb507683007d82cf10793a648f
-lib/codeql/rust/elements/internal/IfExprImpl.qll 93f799492e25c4860d18b99947549f15eed7471fd0bc55bcf1df6dae1a96fc4b 78033d599821b14fe2fa4b79b99ff7628719b6ded70ad1aac4662cc5f391dc2b
+lib/codeql/rust/elements/internal/IfExprImpl.qll 96edff0ae8d42a9ded048576c0c2d68812f8442c390d4da8835df01a18d90eae 0909c086a0cb5b501d4b247cdb27dded409b71e3fbeeb470e582e0538e771849
+lib/codeql/rust/elements/internal/ImplConstructor.qll 24edccca59f70d812d1458b412a45310ddc096d095332f6e3258903c54c1bb44 7eb673b3ab33a0873ee5ce189105425066b376821cce0fc9eb8ace22995f0bc7
+lib/codeql/rust/elements/internal/ImplImpl.qll bd01d2d678a7a1a3c0ba99741374b243774f8dc7b113f2886c022efb915a48d6 0190b27f870cbdc35bb207ee7d048d3b15aed67d8c24989d94d05fe84358c391
+lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll b47501280b026a4e9c21ace21d9ae59f4d126a3a1e03a6088ca38cd676cc4f6d 3b0b325ab0139b290a81355559227050ba3096a58f9ff01c4c0f5c5fb5beb6ee
+lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll dfeee70f08cd0a1e22a120eebf4dfd3603f0129803f67fd552c067d82a622199 edab585496996f3d6280d9935f4d01ced37e40200438276839d68e840bd2c6ea
 lib/codeql/rust/elements/internal/IndexExprConstructor.qll 99bdc3d793c4dbd993860da60abe2b7c604345d645e86916462bc55a6939a5d1 3fe9d7da725956903707806aadbecac8d5b3874e8bed63c9bab54fff630e75dd
-lib/codeql/rust/elements/internal/IndexExprImpl.qll 3b9054645ef574bd4aa7de28298a330f7d63e12ad7a29608a338c96c57359815 877a8e048c0d84b43fef44ea1908cb08907f23d2c47aa472bf62ce30b6b4f5df
-lib/codeql/rust/elements/internal/ItemStmtConstructor.qll 8f263f07fdbf52f58948926e3bfd2234c82b0a852db1c156cae131c1699ef526 b746247a55fc58986255822fb32e67e7f4614a328b8baddd0de6d146b1dd84f2
-lib/codeql/rust/elements/internal/ItemStmtImpl.qll a8f03e575d9cbe269ebc6c01f7c0b5d52984b135bc4dc6240b620c2b3127bd34 79449f3229a5a4d933d209e4e9e298f2b6edf6f1343a486071fdf0fb41d8b02f
+lib/codeql/rust/elements/internal/IndexExprImpl.qll 11c55117a0ce9c095fdd4b034b9810221c8508f77b98357062adace060a10f42 7089f86aa25611d0ff6f73ea78cf11c8d8c8d74692632a801a6872b44f1f3722
+lib/codeql/rust/elements/internal/InferTypeConstructor.qll fb8f2aec6cd1e681cd84a7bd574459e19b9b2a152009290e2eac550f012a06b7 e2b1694f00a4e6a82b13d08d7bb95c98a73792370c1155263d696e60d39b2c3b
+lib/codeql/rust/elements/internal/InferTypeImpl.qll 0fe181340f580066fbd6781e9ab5cb6f43715da1f0bc804d54e485f80a0f43be 0867c58fb59ce9f1179f2612c205629eeba564236a90e2a8b2a6cc85cac5b369
+lib/codeql/rust/elements/internal/ItemImpl.qll a9e02ddc6763e01e738d8b9c9d7782b8a303bd26fd7a4518260c9bbfd4584e18 02c94d8abbcff3160fb05fdf709cc3116db71fe11cd77e1025835404e4f20724
+lib/codeql/rust/elements/internal/ItemListConstructor.qll 08af3bd12536941c3dd4a43c81cc861be24325e242e2593c087a3ce632674291 2fa166159c409d2aaffa73a30babb40829a6de580bd40894d909ee6152801082
+lib/codeql/rust/elements/internal/ItemListImpl.qll 95f83c6d0594fc2c23278103d651d18e42f465eb8c4a858c1dd41717c01828c3 c55a84d9ba98de6c9852bde10c283ed05c2ed8b8650fe8f42c2104adfbb9afd7
 lib/codeql/rust/elements/internal/LabelConstructor.qll 1f814c94251e664bfa1b1a606aef995382e40e78d4f953350ec951ee0bc8bd34 3157fb8c7c6bd365a739f217ad73ba1e0b65ccd59b922e5ab034e3449915b36c
-lib/codeql/rust/elements/internal/LabelImpl.qll 9a7e6ff306a6a81de850a491a4527d93ed0adc653cb2471d30d2ff4f3dcb5d70 0393574c69d6677c01b29e1d6ae0eb46469fc46933a9565ea539089710440f0f
+lib/codeql/rust/elements/internal/LabelImpl.qll e675a130e813d6c98565f2b6e17ac74432c8fe03e23a3b74b36b6208a813e17b f62488b639db74b4d112d272d8f49beb8ce3d6170d1f124de4838315bfc6b9db
+lib/codeql/rust/elements/internal/LetElseConstructor.qll b2b5d68e5701379a0870aa6278078e09f06aa18ddd14045fc6ae62e90827ece7 7359e70bea8a78bcaf6e6ecc8cc37c5135ae31415b74645594456cc8daa82118
+lib/codeql/rust/elements/internal/LetElseImpl.qll 5cc447b2adc97b2f01e182ca80973cda141ed7075a528b22d81b0227bd3f3505 ac19fe01a7df5bc381b92a7ab9567317351a27c22f96fea267dc4738d0a992c1
 lib/codeql/rust/elements/internal/LetExprConstructor.qll 66f27cbdafb2b72b31d99645ec5ed72f4b762a7d6f5d292d7639dd8b86272972 7da048f4d7f677919c41d5c87ead301eacc12ece634d30b30a8ae1fab580ff30
-lib/codeql/rust/elements/internal/LetExprImpl.qll 5166dbadda4969173deb05409a51a611947c42c06ee23c33bc3efe0d961a617b ccadabb005c34fd7700e2bb4e3b0da42785fac386d22137e7d8cdc0c3b8be72a
+lib/codeql/rust/elements/internal/LetExprImpl.qll 9287a482f3f24b8407d674d6e49bda6f24f54241c6c7fdf209d892e162c14ff6 04c8a59a4a3e048c743b238e5af838f859a8cd780181e99d2ce093e243059322
 lib/codeql/rust/elements/internal/LetStmtConstructor.qll 7ee0d67bebd6d3b9c7560137c165675d17b231318c084952ba4a2226d61e501f 84199ba755bb6c00579eee245b2bca41da478ca813b202b05abaa1246dcf13d8
-lib/codeql/rust/elements/internal/LetStmtImpl.qll 4266e04742e282ddcfb45a88e244905d50c4ab792c03b9397b410c48e567a8fa 9ebcc15462f5ab520e7a8707a2693d410368fa5b5d2d7d47636ae680a0fe872b
-lib/codeql/rust/elements/internal/LiteralExprConstructor.qll 8ea3569bd50704ce7d57be790d2dfd38f4c40cb0b12e0dd60d6830e8145a686f 88d07ad3298003f314f74bd8e3d64a3094de32080ad42a7e6741c416c3856095
-lib/codeql/rust/elements/internal/LiteralExprImpl.qll abfb62343abe421e8f91b205740efed1828c44c3e295d4f948b2e0f0c8dc8b25 a81d13dbf9f70132cc95f7aaade3613f60afd023a2156128e88aec54507f9be8
+lib/codeql/rust/elements/internal/LetStmtImpl.qll cd8798854d9d5d704757f94680843fac4c4765239b7bcc5129af421ee367081d 7979973f75c2d306840f98a585d17ba74a74c16b73fb1876a25a320885424cf7
+lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll 270f7de475814d42e242e5bfe45d7365a675e62c10257110286e6a16ce026454 643d644b60bfe9943507a77011e5360231ac520fbc2f48e4064b80454b96c19b
+lib/codeql/rust/elements/internal/LifetimeArgImpl.qll 50ae74ad177f562b83f7a1bad953c049eaa1b8e47f62e1f84b413d4f9d4f107f 5653a3a250513f7ef1c883b8fa40b9befe9eecd6294bf3b05135dd54fa593659
+lib/codeql/rust/elements/internal/LifetimeConstructor.qll 2babe40165547ac53f69296bb966201e8634d6d46bc413a174f52575e874d8cd ef419ae0e1b334d8b03cdb96bc1696787b8e76de5d1a08716e2ff5bd7d6dc60d
+lib/codeql/rust/elements/internal/LifetimeImpl.qll 761fc6dca34b935717a90d8e81e139f0094012dbe1526a0ddf74d401d36be633 fd8332d9591988516fd30509c30a594d04aef69f5a9807fc24c8306ca5b4c4bc
+lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll 530c59a701d814ebc5e12dc35e3bfb84ed6ee9b5be7a0956ea7ada65f75ff100 ff6507e5d82690e0eec675956813afabbbcfb89626b2dbfffe3da34baeff278c
+lib/codeql/rust/elements/internal/LifetimeParamImpl.qll b8f64a0980d78d2e43f6ef3953e02aec3e32170964c9221c72ef1e6ea84163fb f3003c0168599a6033a568eab690a8215a1ab4e5ac24281f9d18b53bcbd05fb2
+lib/codeql/rust/elements/internal/LiteralConstructor.qll 8e07661ace6767c361c6ff7e93eb57fa684aedaf384409097019b4a06efb05fa 232cc0a9c42763537298e7745f34f3fcf6cfdfe90ac757077ed8295a63ec0a00
+lib/codeql/rust/elements/internal/LiteralImpl.qll df1dc24fba01e7cc9cfffca537b44f5fedcc90c2d41453359321fc6d9ab5fd49 809ca94bdced4056e20ae085bd92e1fff276cbb70f4058f41584778c6417e3b0
 lib/codeql/rust/elements/internal/LiteralPatConstructor.qll b660cb428a0cba0b713fc7b07d5d2921de4a2f65a805535fb6387684c40620de 2dbc9fbc56e9de53d24265d6b13738ef5b9ced33cc3c4c1c270e04dc2fc1330f
-lib/codeql/rust/elements/internal/LiteralPatImpl.qll 7862ab4f593b58737c9a0641df3840eb67cb72f413155be107f42aa6aca5793d 076deb575251f2478fbe6353f0bff48c6767b004905bdfac8ddd229a81eb7ff1
+lib/codeql/rust/elements/internal/LiteralPatImpl.qll d9fd80c751f98547cd77e0c0c57e6eb083b6aff5582a281828f25d5540fec140 5a8caaf2cea292f265313bbb5a6d8858413271d6f968aa61b42b808ebbe1f7bc
 lib/codeql/rust/elements/internal/LoopExprConstructor.qll 45f3f8f7441fcab6adc58831421679ee07bac68ac0417f3cbc90c97426cc805b f7ab3361b4a11e898126378ea277d76949466946762cd6cb5e9e9b4bb9860420
-lib/codeql/rust/elements/internal/LoopExprImpl.qll 6d386c548ba7bf0fa3f78f865fcac73da2861eb1bcd412ef4ba56b95aaf70c06 54aa438ede48fb57c90e26d2852f9e17e5f2df1d62cffc6cae6a7c2698d23446
+lib/codeql/rust/elements/internal/LoopExprImpl.qll fd2b330775712fd5da1f635f7c6b30fb82ff58ca77c5ddd7de930230781aafb0 e4b2971498cab29309d828f6cdd8ddc6e80afeed1e87c4d0113f77beb9163494
+lib/codeql/rust/elements/internal/MacroCallConstructor.qll 707fee4fba1fd632cd00128f493e8919eaaea552ad653af4c1b7a138e362907d b49e7e36bf9306199f2326af042740ff858871b5c79f6aeddf3d5037044dbf1f
+lib/codeql/rust/elements/internal/MacroCallImpl.qll 4eda536e5a22dc9df12759a291df59c19e0bbd1b5cff70687f94cd747ada13af 6ec8404164514006316f2db4b54edd56f16245e9195888699af7e0d01548cc66
+lib/codeql/rust/elements/internal/MacroDefConstructor.qll 382a3bdf46905d112ee491620cc94f87d584d72f49e01eb1483f749e4709c055 eb61b90d8d8d655c2b00ff576ae20c8da9709eeef754212bc64d8e1558ad05ce
+lib/codeql/rust/elements/internal/MacroDefImpl.qll 5b2d1e42de4cee3b495db7fddafdf058bae34067131b04e6501d5fb844ee9b5f 146973a0fb0b78f3d75b41143bb0f7343a333f2603e795de668e52cf74f31d10
+lib/codeql/rust/elements/internal/MacroExprConstructor.qll b12edb21ea189a1b28d96309c69c3d08e08837621af22edd67ff9416c097d2df d35bc98e7b7b5451930214c0d93dce33a2c7b5b74f36bf99f113f53db1f19c14
+lib/codeql/rust/elements/internal/MacroExprImpl.qll 0dc73fcb9fc0449b71d2efcdc69f6d400f88e6ba0ec7f8c46c1499790c6904cc e6e4a6c2265e4c74ac72de8579d07c3ec9b4fbd57a4bcc24f379cd825f548236
+lib/codeql/rust/elements/internal/MacroItemsConstructor.qll 8e9ab7ec1e0f50a22605d4e993f99a85ca8059fbb506d67bc8f5a281af367b05 2602f9db31ea0c48192c3dde3bb5625a8ed1cae4cd3408729b9e09318d5bd071
+lib/codeql/rust/elements/internal/MacroItemsImpl.qll b20e9d0ba72de335ae1df33318339c9546c7f4c7ff25b3bf6eec884a2faa33bd 3bb159223eecb566004ce27457d5d97cd676f632be14b0411ff228a1d4e8e107
+lib/codeql/rust/elements/internal/MacroPatConstructor.qll 24744c1bbe21c1d249a04205fb09795ae38ed106ba1423e86ccbc5e62359eaa2 4fac3f731a1ffd87c1230d561c5236bd28dcde0d1ce0dcd7d7a84ba393669d4a
+lib/codeql/rust/elements/internal/MacroPatImpl.qll 5b7640d5e0b7cfe2d5259077cce6acbce0e4817327a70405b22aa90eb728aebc 105d468977306219d6ca9181ad00592033f9ef371d199164572f2049f769680e
+lib/codeql/rust/elements/internal/MacroRulesConstructor.qll dc04726ad59915ec980501c4cd3b3d2ad774f454ddbf138ff5808eba6bd63dea 8d6bf20feb850c47d1176237027ef131f18c5cbb095f6ab8b3ec58cea9bce856
+lib/codeql/rust/elements/internal/MacroRulesImpl.qll 85e4ca6bf0a9feb0a259471e367abad44667d13013710d5b3b13bf17f2e91516 88dc2b5a0e237d9466e3999102e2f2aa26f5229a003c410f7c569259bb63d882
+lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll c293815cd69c002ba6de1db6018672654420f3f8bdd143f9d0c620adddd2be02 d376f8f07661a8cad1b10039076fd7fca353dcacf3ca40ed6507b8c874e849ca
+lib/codeql/rust/elements/internal/MacroStmtsImpl.qll 7ce09c93fedbb6453fccbc081e7ec03d2e2a088c8ff3b27e28794258ac6ff553 d48681d5ed630a1b8d563d58fdb91aa32a73e3b21420d986c8e5415c9f80280f
+lib/codeql/rust/elements/internal/MacroTypeConstructor.qll 0a23573a6f69b38f3d7470050b16197601d67bdd5a4b1a43a155b0b99ccdf6b5 19b623962e8e1f73e55e3ed9712d2a3fe84b9510b99062173902feb2458ec12a
+lib/codeql/rust/elements/internal/MacroTypeImpl.qll 9705f2bc1222a601ed5f9c7febfc5ee0da4c8db98824c23c541683bd74461f9f 573e35686f6d27faa577d1090ba24fe2dc4baf84edc3ab6f361a63598ee0a850
 lib/codeql/rust/elements/internal/MatchArmConstructor.qll b41c1d5822d54127ce376ef62c6a5fa60e11697319fc7d9c9c54fd313d784a93 96cca80e5684e5893c0e9c0dff365ef8ad9e15ff648c9969ba42d91f95abea05
-lib/codeql/rust/elements/internal/MatchArmImpl.qll 6301c587e1192df6cc9cdf047fa78358ce0e8d3712d0e8a95604dc4dfa889739 64bd45abe60ddc60839a66bde00fd8506b63e33418777166ce2b6959ad3169a4
+lib/codeql/rust/elements/internal/MatchArmImpl.qll 9887e13c17b14b540569412d33a25f91d70e5fc8e349fb811759dee732759c37 9d71c504567c8c44f7b8119e78e54e93457a43a5ac85c729c8dbe522df061852
+lib/codeql/rust/elements/internal/MatchArmListConstructor.qll 8bc5ac978fe1158ef70d0ac06bdad9e02aadd657decb64abcc4ea03f6715a87a 4604ab0e524d0de6e19c16711b713f2090c95a8708909816a2b046f1bd83fe24
+lib/codeql/rust/elements/internal/MatchArmListImpl.qll c52142add563ff0cf3d12a70d7182ef00d3ab3b7a76bf899e6ae3de41fa2b4bf d67cf90c95b3a766acfdf408bcbc3d468ad70fb0c84ec9e2693b77598e2ff0bf
 lib/codeql/rust/elements/internal/MatchExprConstructor.qll 0355ca543a0f9ad56697bc2e1e2511fa3f233bc1f6344d9e1c2369106901c696 78622807a1c4bff61b751c715639510146c7a713e0c4f63246e9a2cf302f4875
-lib/codeql/rust/elements/internal/MatchExprImpl.qll 74e9c34318b33969c491716b427d979f33bee2e1abdcc688db7becffa28a270c a96262552eae53655e44792260d369fc94e61e7227224280958fa212a51814ed
+lib/codeql/rust/elements/internal/MatchExprImpl.qll a4410121d177f7880c80f1d2e679029d68d395097727ec6a7fc217a6d0a62483 1fab1ad49806a925e1c722ed52034f6f41af300cfc6aff84e64066435ba9017e
+lib/codeql/rust/elements/internal/MatchGuardConstructor.qll d4cae02d2902fe8d3cb6b9c2796137863f41f55840f6623935a1c99df43f28d8 0c89f2ca71a2fd5a3f365291e784cb779e34ba0542d9285515e1856424cec60d
+lib/codeql/rust/elements/internal/MatchGuardImpl.qll 361c96dae2fc099eea6b670306bce1558fecba1a4be9f0746bfa8aa3b660e838 4cc6f0fed420efdeb9965443be58c48b6fb7525ed964bf11912f70a26c18ff9a
+lib/codeql/rust/elements/internal/MetaConstructor.qll 49ab9aafdcab7785fc5fc9fb8f7c5bb0ae76cf85d0d259c4b3ac4b0eccbbeb56 bc11aef22661077e398b6ca75e3701fd8d0ac94a0e96dc556a6f6de4089d8b8c
+lib/codeql/rust/elements/internal/MetaImpl.qll 59bf4038b0320bef8adffa89365957aa62833e7fb890c40d8ba9924fb60ab503 751c99270f0c94960ba530d1a38093230efeb4d36f599694bfb02e8fe4817bf5
 lib/codeql/rust/elements/internal/MethodCallExprConstructor.qll a1b3c4587f0ae60d206980b1d9e6881d998f29d2b592a73421d6a44124c70c20 8d4eaa3eb54653fac17f7d95e9cc833fe1398d27c02b2388cd9af8724a560ded
-lib/codeql/rust/elements/internal/MethodCallExprImpl.qll 3f48c77949f0569d66047d584fb5b9c40e69cb56b81f99833913b6e7aacb4a5a 2bbd4b1058b621eff3ba40a1c1d39e293e46f375f624abfaae3e6c38b38e69af
-lib/codeql/rust/elements/internal/MissingExprConstructor.qll 90d15dd93cd6bfff08c9ddab18a8caedf6c4eb3a98aba640a557ac21bfb4150b 0199cc6ad9437aab8138c1e72e8a4707878af97ee34eb9ca685f0fa0b9b00338
-lib/codeql/rust/elements/internal/MissingExprImpl.qll 6a24061f3c3b26ff03053c9fdfb8211e2eec6459fe967911a0ab8b9cffb239b8 8bb712f1c3033c64b4b387bf1d410d4a0cd3821e154c55e3993701e760171294
+lib/codeql/rust/elements/internal/MethodCallExprImpl.qll abf0bab14f902879558633d160c4d00e91c46fea24e851a435e952556acfee09 32eeb4750fb064fd08ea8eaf8de9c4bd2ca4ea53e1c8c1d41991e827e4c86242
+lib/codeql/rust/elements/internal/MissingConstructor.qll aab0b7f2846f14a5914661a18c7c9eae71b9bde2162a3c5e5e8a8ecafa20e854 8f30b00b5b7918a7500786cc749b61695158b5b3cc8e9f2277b6b6bf0f7850a0
 lib/codeql/rust/elements/internal/MissingImpl.qll e81caa383797dfe837cf101fb78d23ab150b32fef7b47ffcc5489bfcd942ac3e 9f3212d45d77e5888e435e7babd55c1e6b42c3c16f5b1f71170ac41f93ee8d0b
-lib/codeql/rust/elements/internal/MissingPatConstructor.qll 1d145a8a82cdd5e2c1ea902f3aefda774bfa8efd15f65a7c861327eb2cbb7bd5 9096b503ab71b83d6e9b853615549e8b4356b45e1eb434eb0da7792453856825
-lib/codeql/rust/elements/internal/MissingPatImpl.qll 87252c82e3c8800c9c89c5410fcac9b20e9529e6e68e2c21d99974ecb41dce7a d618a4a115e303464f917c40a5929d571c941bd61c5a19cd21d98eff8db6cdaf
 lib/codeql/rust/elements/internal/ModuleConstructor.qll 31cc83c9d8f25ac07375d19e568f05c068e1f5aa205ff3d9ac31c2510e6f8468 8a70f3f1c18ff87f17e6baf2f05ccaed55c70469288192fc39ef0bb5531b8c0e
-lib/codeql/rust/elements/internal/ModuleImpl.qll fd42715f00d2684307606855207107fe6430daccfe243d307870202001409d03 908a302442476537199e32859b0ddfb5096ea94c052ae190ca6d8739ff1414ee
+lib/codeql/rust/elements/internal/ModuleImpl.qll bd1810aa0b2a985b5ee0c3e18516c946070639052c367d509956e361cb1dbb7b 34cb4d81c8ec9e2f0b3d28175ee7b9c79fb93121ed9a9876fe28ab4c052b0dd1
+lib/codeql/rust/elements/internal/NameConstructor.qll a760134c6d4fc785746e1a5dc042a6bf25b8adaa3947a6897c31e50fd91dd5fd 1359f903d57112bcc1f62a609febb288301bfa810e569aa12e1045fd48b5b5c9
+lib/codeql/rust/elements/internal/NameImpl.qll a16fbc2f8f015e82698f0d0ae0ebe137b27ee9263bfc6ed3c31d7dcfc861829a c52e6bdfd09ca8aab012545eba0c6f95e09038fc360c3f0728caecc8098c86e9
+lib/codeql/rust/elements/internal/NameRefConstructor.qll 5ff6eacc614fd41f98b54cbb4960a07a1471cf4ea291758d33e54a48fd5d1bc4 c538d65414a24dfdbeb49cfd997588227559ba038f0b55d14bb5d89ed1a016f2
+lib/codeql/rust/elements/internal/NameRefImpl.qll 55a41f67cd4af010a956c937c5407ef9068134ebd61cd6e24bb911cb373eb7d9 c63b62e5e6d19a4687499ce6c4ce8290b18862a933c7b376b88e88a155860a5e
+lib/codeql/rust/elements/internal/NeverTypeConstructor.qll 6a86bff9d885eddf39a159698710def40d693ccfd0888aefd090a283cb59ae95 9c51d6569f267dde5597067a8470d19d7714304399de4f730e7b85ca21feee20
+lib/codeql/rust/elements/internal/NeverTypeImpl.qll 26959da017a517d8aa899abe3e331aa86e994a25cd66e914aab1c998832e3223 ba541a7eb97a5b912e9f3ccf2589a685f856562e9a5dc12c87d2caa88ebe36d0
 lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll 616e146562adb3ac0fba4d6f55dd6ce60518ed377c0856f1f09ba49593e7bfab 80518ce90fc6d08011d6f5fc2a543958067739e1b0a6a5f2ed90fc9b1db078f0
-lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll c42b17283361ed3404f664451ed660da9aafb116c8aade4976232062a8c9643c 0ff4fd04a0a57c37d1bfc256b60c6b878cbd4252c04c95f7f89aaf61cf13206d
+lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll 551312b99587ec549d4ee9683b17acf81e4c550deb0a99fbc7a5bf3aac0e0b39 724cc0a9d3c72027b42fdbac6e58f07ca229ca2fc6242f7b7318cae2ed6cc116
 lib/codeql/rust/elements/internal/OrPatConstructor.qll 4ef583e07298487c0c4c6d7c76ffcc04b1e5fe58aba0c1da3e2c8446a9e0c92b 980a6bd176ae5e5b11c134569910c5468ba91f480982d846e222d031a6a05f1a
-lib/codeql/rust/elements/internal/OrPatImpl.qll 5074cc7d64f4a17103b8a546e5a3e73d7c7be4f4047497026f2d430d47a77ba7 c51bce75e9a4ae57ad6b72d6ba9a494703beab6c05483e1c53bcac213c754236
-lib/codeql/rust/elements/internal/PatImpl.qll 37c9b1da7aa625117644e2cd74ec0b174f69a38cf66926add01786a05d5ad2ad 143685a0b4873fa0b73b204285dca956e59b32d527bfac6cc336326d244994b7
+lib/codeql/rust/elements/internal/OrPatImpl.qll a6d59ef97389b6510488c47bc47d0bda73ff0d4632e5ff6e013f1aec512a8b18 a4acfbe9432552b8a1575daf1341040cb978d1483f4b373566294abee08ba681
+lib/codeql/rust/elements/internal/ParamConstructor.qll b98a2d8969f289fdcc8c0fb11cbd19a3b0c71be038c4a74f5988295a2bae52f0 77d81b31064167945b79b19d9697b57ca24462c3a7cc19e462c4693ce87db532
+lib/codeql/rust/elements/internal/ParamImpl.qll 7c97099f6ea0ede0ac630e0d21f98450426a5cd1d1ba1c04008da63b26215436 ba0b610558b49d12e72bbda616a6b06bb8a896d14826722186b614b5850f51a3
+lib/codeql/rust/elements/internal/ParamListConstructor.qll 3123142ab3cab46fb53d7f3eff6ba2d3ff7a45b78839a53dc1979a9c6a54920e 165f3d777ea257cfcf142cc4ba9a0ebcd1902eb99842b8a6657c87087f3df6fe
+lib/codeql/rust/elements/internal/ParamListImpl.qll 67024fc7251811eada96f9e286dffe4ce4ff8c8b66a003a3f7aea57130a01cd5 229cce05711012555d3a62897ad3bb1a5f06be8f17de1f008dc1a8459b241a07
+lib/codeql/rust/elements/internal/ParenExprConstructor.qll 104b67dc3fd53ab52e2a42ffde37f3a3a50647aa7bf35df9ba9528e9670da210 d1f5937756e87a477710c61698d141cdad0ccce8b07ecb51bab00330a1ca9835
+lib/codeql/rust/elements/internal/ParenExprImpl.qll 3a83e0b3eb724eed2de2e22fe5025cfe1411b1aa428d3f7c9626c897309c4204 4f085bf8d572a137262ef768a0d9d38f0cb15bd8200aa1f691db68e11a89ed0d
+lib/codeql/rust/elements/internal/ParenPatConstructor.qll 9aea3c3b677755177d85c63e20234c234f530a16db20ab699de05ca3f1b59787 29f24aed0d880629a53b30550467ade09a0a778dbf88891769c1e11b0b239f98
+lib/codeql/rust/elements/internal/ParenPatImpl.qll 72e2400b80908267962f20bc2e50ee8f14fe2e8dd1d78535b6d6fed447caaa36 e1a183b837a0497fdaa4e4b9e14442adfd47443242c04a92f785bc0a3e7f9ef8
+lib/codeql/rust/elements/internal/ParenTypeConstructor.qll d62e656a4a3c8ffd4eb87d49585a7a3bfb5dbe3826fbcbd11cb87b46f34c19ae febf6535965afa0f6eac4d2b08730f5a07bbb36a7434abe0a7663d7264961a3f
+lib/codeql/rust/elements/internal/ParenTypeImpl.qll 47964e1578c116bf0d762eedbac14ffe1f4b6cc724d391fda4b03ffdf37607a0 146915450f466cf0111af30eda4159d2ee3feaa19d8ba884badcae1e279c43f0
+lib/codeql/rust/elements/internal/PatImpl.qll dce07d0458cbaa008087086aa10d12939fc805002b6abb6f1f9c7a03db2dbeba 8bd0f1546bdd53111ff11f628a34124f3f3d361031e77deabf651800627d3293
 lib/codeql/rust/elements/internal/PathConstructor.qll 5c6354c28faf9f28f3efee8e19bdb82773adcf4b0c1a38788b06af25bcb6bc4a 3e2aeef7b6b9cda7f7f45a6c8119c98803aa644cf6a492cf0fce318eba40fe8f
 lib/codeql/rust/elements/internal/PathExprConstructor.qll cf6e0a338a8ed2d1042bdee4c2c49be5827e8c572d8c56e828db265d39e59ae3 36a3d1b7c5cc2cf527616be787b32071b9e2a6613a4f6b3f82e2a3b0e02a516f
-lib/codeql/rust/elements/internal/PathExprImpl.qll bb888ab8813b6aa5c46004f9ee2cbcd1f2c5f3e5c76d955a13347ac9acc86e7c 2a02ca505ab1b068821fe331040ecf8db9d6485d9c1b89d27e7e13c64ae624e4
-lib/codeql/rust/elements/internal/PathImpl.qll 60351deb99f6bf4c08f578348f0e0d1fa090f16c94b5d52cd974a18f8b176b5e 0e1e0b7388a40c65dd0ca228893e1ca2c1803b3b1eccb819379d12bce66dac42
+lib/codeql/rust/elements/internal/PathExprImpl.qll 412f2ce2ba8b2d81b5a626eb49aca16fff9cbf560061c7b55aa78f512e0d2155 510a07db0dc8e5e21189cf3e72f3ca9e36ce44c2102f786b3099dabfbe7a5405
+lib/codeql/rust/elements/internal/PathImpl.qll 7105070c7a5cea4b2fb4d7b078c208ada8e1b3d7143751fee1ac1d2a7bfd40f3 947e6a308558c9da398080e98b321665bf678542c16385d66d395bdbc44dae98
 lib/codeql/rust/elements/internal/PathPatConstructor.qll 966c4ea22218ef71e000d7ce8dd5b570c39ad96b9239a3aa8a38292e2a9f36d2 8a1f348e9257ffc6e6bedcd70389b8e7ec2a3ed6e7b3733744ddfab284826e57
-lib/codeql/rust/elements/internal/PathPatImpl.qll ec58711b3793b7ff98a25db254cc1b3c378b4bb612e9cdda57544fa56bf39fc6 a8f893d27b6ee610b72162b2a0d41a7c4d2a588fd722a977c680a59cf9abad91
+lib/codeql/rust/elements/internal/PathPatImpl.qll 27b6551f092ea78a537e58d047ced185a3550e30a2210e0a759753d9f097ce1f a2aef1917021d05c51dfc1b7b431a2a288630966a118d29e0f00e76e83694720
+lib/codeql/rust/elements/internal/PathSegmentConstructor.qll 2d9639e42035dc7e73b7d6ddb8a977beadc6b4492dee4292b2f85b4409344441 c337fc3b9ef56366428772563e3f25f711474d16e860d3e89c1395a95d9e83e7
+lib/codeql/rust/elements/internal/PathSegmentImpl.qll 188e96a2939aa5529fede1984d2ec652fbda2715298a4b75a1c3b6fc198e43fb bbb932c32ead04defbeca3de9c1513425ddbc36dd8b8e710d9b96d31931b68b1
+lib/codeql/rust/elements/internal/PathTypeConstructor.qll 8949742c7ab7fcfa3a3f6469e87355a6888931ab9ac7a6a07d2bd51e3fdf8283 fb1a402e94e9a1f33b7757338d7e95b107933339615a4fe86de33e41206dd94a
+lib/codeql/rust/elements/internal/PathTypeImpl.qll 00776695c062a01034a639c81dcfe9309c9293a7639eb79103d1bb8e978b7a86 7d7a6fd02edcff2a7f6ea843c97efc74a3484622bf9b25c5b9ed21bc8bdf251f
 lib/codeql/rust/elements/internal/PrefixExprConstructor.qll 90c50b0df2d4b4cbf5e2b7d67a9d243a1af9bfff660b7a70d8b9c7859c28bca7 1a1b5ea1f06ed8d41a658c872e8e1915c241a7c799c691df81b9a7b55d8f2f1e
-lib/codeql/rust/elements/internal/PrefixExprImpl.qll 8c13f1459d064999ce8b047eca64ffa54faf4e84170e5ec233d27f1cd857e279 b35e2fbd5b420d3f7f912f3f20290f7d2f7330540d06d6a8a731436b00769bc6
+lib/codeql/rust/elements/internal/PrefixExprImpl.qll 705f30cc07e10a70561d7fae318531042b7abac2e01fe9c6ee093ac463259bcd f066327bde8cae9bc57aae311fb1482e0118af0cb7834b3b28cb1b0bc7890eac
+lib/codeql/rust/elements/internal/PtrTypeConstructor.qll ee3c4326ea3f198d2537a914dd6eb51d0cf247310f037e13e87632fbd6cfb50a 3814218b5271f3c6c45b52082cca2a3250a2573abced43fe53e1b4145374afe3
+lib/codeql/rust/elements/internal/PtrTypeImpl.qll 1bb1b033919ef5c9984e9ff467ad9f25fa40c7a91935763fd491e83dbfea81c9 b45341d062ce3eea54cb9002e7f7f93b54b6019973d6c5a3e65610acaeb86584
 lib/codeql/rust/elements/internal/RangeExprConstructor.qll a0aa90a1c38c5deea56475399016afae2a00a858b961fbbab8ddeb3bc6a08103 0ddf1bcf28aafc56d7334e6138fb268f9b36a429e4cbdd982cd8384e0644076b
-lib/codeql/rust/elements/internal/RangeExprImpl.qll 15995d2dfd76a0b1c9f40d0ea90057ef47bf0099380209c45c2f92f231dcb1e1 dd6acf3ad201568da00feb759d41a4c88fb118c9e1424340537fc402ef716cad
+lib/codeql/rust/elements/internal/RangeExprImpl.qll 5a450edc738a4a749e3ab52067cc69174800a17b41a12d4d76f52306b331c054 d6dbf897facd96115491c0ce216f999d96ed7756a6377462e5fb59d290b9a292
 lib/codeql/rust/elements/internal/RangePatConstructor.qll fe4345cb41d970ab64196ca37eccb26e5b9cf85fab4253cacfd2b31de03bd070 1d09d5ec8203d76aed2dfb7e7f14c0c07d6559c8f589e11860fff8a2c682c1a6
-lib/codeql/rust/elements/internal/RangePatImpl.qll d6ccca92ffd2c4ff067d9afd166bd27e3db26cb2598e9c9bea70c323337747f7 d75d08d48dd456c99353e553510024c165d8d3cffe431ae0edba118b23137ad0
+lib/codeql/rust/elements/internal/RangePatImpl.qll ee26a19138173a1f02252d94560116921b368466316b3a9ae563583ab31d3852 5cb78aeeec2e6aa91113335905c55e4eec8560ef0cb719fc0af89647bcf2b318
 lib/codeql/rust/elements/internal/RecordExprConstructor.qll 742198bd8223902b5625b4a574a9e3539a8b6cf8e48eecc57cc2de4e980fba6e 0a99e454e234e8b7b59dc11b167172a5fcd31b8a5282349956d6fd861ec735df
 lib/codeql/rust/elements/internal/RecordExprFieldConstructor.qll 11620bc4e2dc7b3903be764cd9510a8e002892722b502876cf3467994aa7a63c e42e50747dd9453a44705b2d6a05e7a4a8c6debed988a0335a774a547d8f7157
-lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll 1a533819f9847e0d2a1c9157d17ef00c41834c228038543c0ce1a50a7486a026 042ceb450dfd91f2b8c6cbd0e36ce329043fc6ccfa55d11f4398420e3c9da6f9
-lib/codeql/rust/elements/internal/RecordExprImpl.qll da219dcb124c406b87cff8f61082fa2a6b4ae9ed780a4da2615c0dcecac05cf0 61ea7c8a55db320ccdb8b722a289a2b3f06b89b3b49cd0292499a496a0516b28
+lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll 848dc10812e04826589dfceb96881fd2060e640f3dc4f07bc7cd577e7a94fb53 53272a6c7b03991e2de6ad78d0f895ba4b09521c8ace556d2225667953521884
+lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll 3a0d6ec872792c400d3a0a5ed1c5051b248a597a4b17ada1a078ea5d972b6721 52bae8222e7aa5bc89b73bec3fd1c3c1de0fe11bf30ccf5668454f63fbfc9b83
+lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll 34b1274862d771477b474a01525ec6328a9d5a2f2b69c56988c90533d94027a6 8683af4afd5b3063ba5aa842463c506a81bc570a49d005f245dea8b8dc831ac3
+lib/codeql/rust/elements/internal/RecordExprImpl.qll e25f6e969e5d854203b7cdf122056a2b21bcebc7b45621c308e8b8f581b03e35 0e5ab6e1291fbdb04e8247b5c4a28ce98a42ef9711f0320e81df2161c9703deb
+lib/codeql/rust/elements/internal/RecordFieldConstructor.qll 9fc05f5101e48a45a028c479b35ec3d2f1a3cc33f0938667fcb813c5a4ab9526 98791dcf7f3209524f6132f9c26980e499cbcf94c1559e95c67544732245f05b
+lib/codeql/rust/elements/internal/RecordFieldImpl.qll 2c40da630d03e007bfc59bd4445efbcf4f741d0703accfe5eb1c64f7ce0ea160 466434091028554820d4f88571f1cacf7df98e77a6952c73782208d035cdb64c
+lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll 9f1d916f3784092dcbff7224451c8f4f0daf6f8293a466b0a30ec9b92cd41358 8aafe377714a134287362c4b96439c1c6baa5a31c2c36a544bd5f73e9213477a
+lib/codeql/rust/elements/internal/RecordFieldListImpl.qll c4e0928eb68e028ad7e03e3227b27a87e50d15bbb863fac303681918f645500c ae057b73fb5fd7f845f8fab802f26ad73492d9e5a565d73346c90288f0635ecd
 lib/codeql/rust/elements/internal/RecordPatConstructor.qll a5507e0db7cb297c74faa9d571e613799d7b3327584e4696d1d5c219d1ea84ba aa5c8042a88e99dca09a6ea7775bd6963825a3c2dd5d61f118dbbc57a336c4a1
 lib/codeql/rust/elements/internal/RecordPatFieldConstructor.qll 6e1880ed05401b39c1e5e1a4eedb0a8a18c857aeb79c44c812cdc879eb3af1f4 1f7a5a2d4df22f7d7479fe348665d8a1411de47f8cc5b95b30ba4c3490ed8f61
-lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll 9babeb072042f6f3ec7a7ada2ac6d9b92c261ae74f0a92426e9ce7ab0b03d673 7ec0594be16ca134d502480ad96b119388c293b40ed3e1e0c44c91acb5a00124
-lib/codeql/rust/elements/internal/RecordPatImpl.qll 26ee258fd597730a85fb63ab851f81195dd86fcdc09b7df251aca85c0ec31b4a 04dacddbe890d0e84ac72c2e2c16d8a1acb83bd9448516b56f2b6fb917aa85ac
+lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll 38124e111d2024c00ec528075cb3db6c4e695c83449b63141358ce39ceab1169 bd2f31e65992656e25fc67ca0d32e745ecd6d7979c049e3dd38cd3d36720fd78
+lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll b8f0ef9b75ffe6be6ce7e601d528f0a1b871123c63e39cead3fd13b8bd4f54b7 166f07c708ab8b3de6bfaf193bac93081b2aacad046aa86de7441085dd20a8c5
+lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll 7b7096f1b64c481f00147b19a016db9a2338be232e977aa37a705f297b2ebebf bfbf15b1be611b66aa59cf166a592d3c3e3540f81cf169f6fec5c33f2fb6fde3
+lib/codeql/rust/elements/internal/RecordPatImpl.qll 303cc3709283004a8174785106264f705149bd2a5a0690170c65cd0ce1a545b4 05d8598bc5a439e61ab5eb37ed43229cf780d507582d509aad6e42862c86d33d
 lib/codeql/rust/elements/internal/RefExprConstructor.qll 9ad08c0f3d980a56a2af8857cb84db589941d20ab3ae5c8ece004ccaccaaf950 4cac3ace31b7ed77a72e989fce9cdbae2247f03c28a3f0c50d67385d02c7f193
-lib/codeql/rust/elements/internal/RefExprImpl.qll 30e2f6d03701b302959438d030e6df1d62ec7f532845fa06e1b3353c960b6843 39f2b3d1bd8086304a8aa1caf7dd26b0d4b3337819a3bb32e318edea1f5f320d
+lib/codeql/rust/elements/internal/RefExprImpl.qll 15b0b04ab1933b2d12b05c6c7ac3b86c86df35852fdfe7fdcb7891dd142497a3 31df2ab59987bcc959ad231c7a49f9562c1a1c8d8485da1675c9117357f389f2
 lib/codeql/rust/elements/internal/RefPatConstructor.qll d8b88c2c468b08072f6f853306eb61eb88ee1e6c5cfb63958f115a64a9715bb3 0c1d6a8af6a66912698acce47e89d4e3239e67f89c228a36a141f9c685c36394
-lib/codeql/rust/elements/internal/RefPatImpl.qll 16e8c3b5784b7d9886b3b9eba675c60bf9b35e2dbc4628a6ad7c0f8068ad4734 38b7b47bfa257f5a1db026850438459899a83914232fd39c8e581961e6a1847c
-lib/codeql/rust/elements/internal/RepeatExprConstructor.qll 97cf95354fe6cf6f7e6a35c2eac3c260608e0480cc938bf982af09ba3e5f79f1 0d0fa66e78a381bca61d798b79928a055cf28a1d6c5931b70db2e8c71e496b95
-lib/codeql/rust/elements/internal/RepeatExprImpl.qll 541c994c92d9d239272d78af91b43ff688662adfc98abf27b4a66b5eceb2c8ae 596f003caa90cfc609d3fd9c93afa3ec702556b5bdce65736a93198e5e61301e
+lib/codeql/rust/elements/internal/RefPatImpl.qll 2ba9579cf0eb23ae744632c046644a18a3e7ea675bf365f01440d76e8e9c7a31 94d5f6b70130ee61c1ccea1dddcc91073f8212eded23d096ef581001fb31a67f
+lib/codeql/rust/elements/internal/RefTypeConstructor.qll e1952aa69586b440f878400a52d09b2d12d5a29dbe9651360344631cb9493cd4 e4ae45e89472dfd4547d647c75e1635cf065a7d221ed60ed34554f265c0c5405
+lib/codeql/rust/elements/internal/RefTypeImpl.qll b8781f1d1f4f1f76086a7206dc249b2f7866925f8f9fb68068aee8629e209adf 3282fe28629779f3defd83b0e439512828a8fef8d099afff0d17b34a56eed576
+lib/codeql/rust/elements/internal/RenameConstructor.qll 65fa2e938978d154701e6cac05b56320b176ee014ef5c20a7b66f3e94fd5c4a7 dfc0ff4606b8e1c14003cc93a0811f4d62ec993b07ff3c1aa0776746577ed103
+lib/codeql/rust/elements/internal/RenameImpl.qll 58918eeb6980c22ec0390045fed24d20a504265545d3e0b1db63d0850849f65b 21eaf4a618d5201e3ca594ad04ca71682a5cf31f5fa2ba616deb3f975e2f1421
+lib/codeql/rust/elements/internal/RestPatConstructor.qll 45430925ddf08fba70ede44c7f413ddb41b3113c149b7efc276e0c2bf72507b4 25c678898d72446e7a975bb8b7f2fde51e55b59dbd42f2cca997c833b1a995f1
+lib/codeql/rust/elements/internal/RestPatImpl.qll 80426dcb1e70079b6179527c9305ccb255270511a8c48b4be84b00ecd42e6c0a 94bf29a823cbffac5486a9bc4082a2f5a08ceabea3d3f27bd8d3be99d2058fb5
+lib/codeql/rust/elements/internal/RetTypeConstructor.qll a96d803c6e4b40be49cfed0853a3e04ae917c47351e5c880fcab06eddf1af9cc d06a0a191cb14c270c0441ffc3d289263808170dcbe05e01847a35ac9d61dfb3
+lib/codeql/rust/elements/internal/RetTypeImpl.qll 907a3cfe03b65ff36dcd357caccb72a9d3c18ea5c25d7cb8e3502dfdef6583cd 3c622c4860c2feacd10331125e9765e07e57e62706035ad2aca2a97b916c257a
 lib/codeql/rust/elements/internal/ReturnExprConstructor.qll 57be5afbe20aa8db6e63c1f2871914c19c186730ad7dccaa424038c6305730d5 4d3c4f2e9b38a4b54ff26a0032455cdcca3d35fec201b6c932072a9e31fbb4fe
-lib/codeql/rust/elements/internal/ReturnExprImpl.qll 1aab5c6ccb833af9bc944180e767eaf156b3a3c840f1c7de1d73342c86204bd6 02d9f7f7fb43f4a5f14c915cb5af2837a7d9f713d9ec35f62e36a440f7bf916e
+lib/codeql/rust/elements/internal/ReturnExprImpl.qll 735e30000f638d6fec40cf4cde512e4069cc6e898a17f7ed648026691af193a3 af904ca196a99ee30e502e1aa96a84892c3c8d4105e53e96eca0731570306938
+lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll 8994672e504d1674e5773157d0ad8a0dc3aad3d64ef295e7722e647e78e36c11 abe7df754721f4ff7f3e3bb22d275976b2e9a1ef51436a461fe52ebd2d29cff1
+lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll 1a9bc60d92d845f5b82c1b826d479394a96707c798ba0e1dc57113bd4c443980 1967d10995463346f6c25651d31f1b9dde45d5b2f9c46b9d2ccc090ae1a6b6bc
+lib/codeql/rust/elements/internal/SelfParamConstructor.qll a63af1d1ccde6013c09e0397f1247f5ab3efd97f3410dd1b6c15e1fb6cd96e54 0d8977653c074d5010c78144327f8b6c4da07f09d21e5cc3342082cd50107a81
+lib/codeql/rust/elements/internal/SelfParamImpl.qll 0c69ad2ea3dada21c207bdd2e0059d13bb6a11a68226262f10257ca01c6cbe30 4b18864e576069651eba6df6dce609a7a75991900da9ca3693f112d39f29585c
 lib/codeql/rust/elements/internal/SlicePatConstructor.qll 19216ec9e87ca98784d78b29b8b06ea9ac428e2faa468f0717d1c0d0a8e7351c 458e5be76aa51aec579566be39486525ec9d4c73d248cb228da74892e2a56c08
-lib/codeql/rust/elements/internal/SlicePatImpl.qll d03ba5d512fa05f3d3922367f543f6504dcf360fdb87f5d470c69ded02d8b032 235b9c4b1a7ccd21b1c94b57b7bafebe3561a20f8ce1d7f917956953fcf9f294
-lib/codeql/rust/elements/internal/StmtImpl.qll ea99d261f32592ff368cc3a1960864989897c92944f1675549e0753964cb562f 9117b4cdfad56f8fa3bc5d921c2146b4ff0658e8914ac51bf48eb3e68599dd6b
+lib/codeql/rust/elements/internal/SlicePatImpl.qll b2b730e769c5e01c3773072591ddb6252623160c405cc8a4b29f9ae40325ca77 496b2b120434e131f7dd5789374444a957121339b299609ca1031d8bc93e81a2
+lib/codeql/rust/elements/internal/SliceTypeConstructor.qll 643e7a2ae261e8f62de8bc2886efddcc096e0c7e8159c0b9e87b24d0509e10d0 719545abb0ccf6e8a203ec9c9f75109c5ab0593c838e2f90e388858680ec62f7
+lib/codeql/rust/elements/internal/SliceTypeImpl.qll 0ea170d7ebd3655637fe2c8e40a51f5209b0c20b6f3d987477f0fff138f16c2a f253a681c9db9ea75085421091bd336f3e222ca84910eeae992242c160305e03
+lib/codeql/rust/elements/internal/SourceFileConstructor.qll 1dc559887ea7798774528b5505c8601c61030c17480f7ffca49b68b76fcc0321 75a635b88622e3110b16795bd12ca6fc4af176c92d6e441518d60aa47255edc1
+lib/codeql/rust/elements/internal/SourceFileImpl.qll a23017bc5c4c88446cd31bb2e9cef7068bed0413129a6b81767cded64c1c7e64 8f4bb769e590469e936bee0d6811ba41e566d4eb76f8aa2ba57f77b376f1254b
+lib/codeql/rust/elements/internal/StaticConstructor.qll 6dd7ee3fd16466c407de35b439074b56341fc97a9c36846b725c2eb43fd4a643 5bf5b0e78d0e9eb294a57b91075de6e4b86a9e6335f546c83ec11ab4c51e5679
+lib/codeql/rust/elements/internal/StaticImpl.qll ad41f8d031d53b4e69704ce3e816f61ea70104ae5d0b905552f5ab0e7d44e70c 5b547decc6a8c4d0476e48b07492fa872196bc9decb89f222b664c8a1692f7e2
+lib/codeql/rust/elements/internal/StmtImpl.qll 5536f44c61ee00a69281dd37f3d44fbcf829ae265b21a2d4d15abfdcca338a2c a154dad2b15d052e5f144f234fd7e85f2b3b7ed4431b3704f6994e45156ec33e
+lib/codeql/rust/elements/internal/StmtListConstructor.qll 435d59019e17a6279110a23d3d5dfbc1d1e16fc358a93a1d688484d22a754866 23fcb60a5cbb66174e459bc10bd7c28ed532fd1ab46f10b9f0c8a6291d3e343f
+lib/codeql/rust/elements/internal/StmtListImpl.qll 8ba7e9751a851f22b74aed8e6663f235b71769dd6e32495c9b0df8458a808f88 ad4d0128407eecf094ed7890a68851972262efc5d315fc31cc66e695875dd38f
+lib/codeql/rust/elements/internal/StructConstructor.qll 52921ea6e70421fd08884dc061d0c2dfbbb8dd83d98f1f3c70572cfe57b2a173 dcb3ea8e45ee875525c645fe5d08e6db9013b86bd351c77df4590d0c1439ab9f
+lib/codeql/rust/elements/internal/StructImpl.qll 947c4107bc1b11db8290a4a9e796560580923439a7232d9f1ba1f89008b21480 3f8d325b1b2b0efff8aba4921e32a4df654fb58fcc8bfcba1c99858087cacd00
+lib/codeql/rust/elements/internal/TokenTreeConstructor.qll 0be1f838b04ff944560aa477cbe4ab1ad0b3f4ae982de84773faac5902fcae45 254b387adc2e1e3c355651ab958785d0b8babbc0030194234698a1219e9497b3
+lib/codeql/rust/elements/internal/TokenTreeImpl.qll b57f16802422489e9be95f925a3510cedc2109ce85f142dd8df22100c6de303a 2021c8a85ab199b73fa6680036fff750ec0c3e1c4f31a185213a8f874f0200cb
+lib/codeql/rust/elements/internal/TraitAliasConstructor.qll d2f159cac53b9d65ec8176b8c8ccb944541cd35c64f0d1ceabb32cd975c000bf 6564981793de762af2775cc729e25054ea788648509d151cbfdbdf99fc9ed364
+lib/codeql/rust/elements/internal/TraitAliasImpl.qll 6109325f8caf53f58a76e6eb8b212bce4fb4192c03fa6405c2aca218b52bb407 011634fe660d90f4187e33b3784f269a2dc27d71c736c20be0245c5bf16d04f9
+lib/codeql/rust/elements/internal/TraitConstructor.qll 1f790e63c32f1a22ae1b039ca585b5fe6ffef6339c1e2bf8bca108febb433035 535cebd676001bfbbb724d8006fa2da94e585951b8fd54c7dc092732214615b5
+lib/codeql/rust/elements/internal/TraitImpl.qll 3a540288020ec7b87a77cd96bf8b0aa173b128d61b65edbbe9c4187f366a6d89 a1d669a3956cf7a5eaa74bcaf4dd9dd966673446a5c08001536d76270c3f7ee4
+lib/codeql/rust/elements/internal/TryExprConstructor.qll 98e3077ebc4d76f687488b344f532b698512af215b66f0a74b5cea8ed180836c b95603c10c262911eeffdf4ccba14849e8443916b360e287963d5f2582d8e434
+lib/codeql/rust/elements/internal/TryExprImpl.qll dee6d67ab6f065f8391f68d05e4f6ae50a2faaf7325040ecd4f4998acb9cbfab 9387b7fd773036db97dde4aa699e1ce0e451cf9e3110e3728fce8a376f873cb5
 lib/codeql/rust/elements/internal/TupleExprConstructor.qll 71c38786723225d3d90399b8a085b2b2664c62256654db9e1288fadd56745b9d 639ad70b49ebadc027127fbdc9de14e5180169a4285908233bc38ccac6f14110
-lib/codeql/rust/elements/internal/TupleExprImpl.qll 28d3e741102d86426e80b224c8839e808310a743cb87d780d91891d60dd57105 9b2e709cabb04da79eab29ad6f4df525cc272ce77abd837baf5cffbb0378152b
+lib/codeql/rust/elements/internal/TupleExprImpl.qll aecd557e196af3b72e74b56b753b96821e25afaac60422782f75236c999418e5 662f9c345782287ab05beecd00cd46554f08ec496c185141496a75c3e6ce1643
+lib/codeql/rust/elements/internal/TupleFieldConstructor.qll 89d3cf2540235044ed5a89706cfbdebc5cdf9180fd5b6d3376c79a1b2c0430c0 16861fe089aac8e42a5a90d81dd48d5015391d0a06c78ca02bd876d65378699f
+lib/codeql/rust/elements/internal/TupleFieldImpl.qll d19737bb02e86705a20501acd730775c666b2bcc9e8d0cbada3c8a9781d08dd8 94729e3b264de6e77b68c067284055f6f255eff6e39fe45956ef680914a7090c
+lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll 4335ba2061b6e4968db9ec05c0b4d3e6a564db89a2df69e036f317672a7900b1 0b8dded875dbf696cf588e8c21acc27332a2ff66ced7bfabdfc1ad621991f888
+lib/codeql/rust/elements/internal/TupleFieldListImpl.qll eed8fd8801361bbe6d37f472f05804a4194771d469bf586e3dd050b6143087dc bee1d26a424ee262e61d7939cd8c7a6d7f6f930dde6c54a48c21852bf4a6c540
 lib/codeql/rust/elements/internal/TuplePatConstructor.qll 2a5e83ad5b8713a732e610128aeddf14e9b344402d6cf30ff0b43aa39e838418 6d467f7141307523994f03ed7b8e8b1a5bcf860963c9934b90e54582ea38096a
-lib/codeql/rust/elements/internal/TuplePatImpl.qll 75af93f7c7df0a4cb07090b3dc499a0214b39cee7ab9fdba4b655c7257fc140f 57da9cd8e98434b2c67d2db1b09713b9b050b4ac9307d533a050edf686f6eeae
+lib/codeql/rust/elements/internal/TuplePatImpl.qll 4f70ce09ef78f7e49cb6aa06f0c33d16aca6732d4fd8bc821dbbf9c161f47e42 e0762a8026031197478a11b85616dbc0dd3f6ac999e601c9fc50fda1b47ec44e
 lib/codeql/rust/elements/internal/TupleStructPatConstructor.qll 9d68f67a17a5cec0e78907a53eccfa7696be5b0571da4b486c8184274e56344a 3ffa29f546cd6c644be4fecc7415477a3a4dc00d69b8764be9119abe4c6d8b9e
-lib/codeql/rust/elements/internal/TupleStructPatImpl.qll f92be14d043b8334d389e6db44d9de9b3577dc11d64ad1499b0dfedb9cbad2c4 1fd03ef66a1d41e97aaecfef11645eede34d3838be6772642b55319a271d96e3
-lib/codeql/rust/elements/internal/TypeRefConstructor.qll 2b7bfb8787c2ba2ca4bbf38b81c311f878d870e121ffab31dda03d51a931b310 096f90ee71c6e04c54f2fc07c4c80a5dcde39e6126330ca8f17d18c9f90c32a8
-lib/codeql/rust/elements/internal/TypeRefImpl.qll 2207aaad49e5e784688add3710135d232025e58506c2ff88710c149c2b698133 4c36cb18182a4bbbfaf7817da997943024801295d78fa6fe68d54fdf8924eb4f
+lib/codeql/rust/elements/internal/TupleStructPatImpl.qll 5c405ee33f6dd1ba3c2416cf545ca573e2f30885e4078d03f5946a05dff7bf13 910da4a0f9ecb69b12a89576f621b96eac2ef99f43ad41b55d3e837bcf1c81c9
+lib/codeql/rust/elements/internal/TupleTypeConstructor.qll 88eaec829cd4dcc6a152c7a335b1d365702ef410e46d9c04806fe53f06325b23 044fd0aca067bae82eb8ac448b7bcc66bc736e7e0ab8b770ee126381888fac3d
+lib/codeql/rust/elements/internal/TupleTypeImpl.qll e05ca0beac96ba091083c9c73c458f2458b055c0e4f0a4a376066399d43145ce da55303ba9d00d7a4cac4b032836a9fbd4aec1473f1289ecb86ac31c5b5aaf8b
+lib/codeql/rust/elements/internal/TypeAliasConstructor.qll 048caa79eb7d400971e3e6d7e580867cbee4bd6b9d291aafac423aa96c321e76 d1d1e33a789ae6fa1a96af4d23d6376b9d82e14e3cbb777963e2d2cb8b22f66d
+lib/codeql/rust/elements/internal/TypeAliasImpl.qll 333415cffc80e5500304e9fdabb83e9fe72dc3fa5e3081fb56f7fdddbb7aa43a 81bee811d15991e8277eaa6bc5794a8abb8031bc7f64462bd55418daace8c38d
+lib/codeql/rust/elements/internal/TypeArgConstructor.qll 51d621e170fdf5f91497f8cc8c1764ce8a59fde5a2b9ecfad17ce826a96c56c4 a5bbb329bde456a40ffa84a325a4be1271dbde842c1573d1beb7056c8fb0f681
+lib/codeql/rust/elements/internal/TypeArgImpl.qll f02f11d36de498c6e6db2c40a49e5013d8bc1cad93a7f093423c8770350786d5 e08dc45dd93c052f4cd38485c002b057ec5af8c634e800eb7dcafc963a1da369
+lib/codeql/rust/elements/internal/TypeBoundConstructor.qll ba99616e65cf2811187016ff23e5b0005cfd0f1123622e908ff8b560aaa5847f fde78432b55b31cf68a3acb7093256217df37539f942c4441d1b1e7bf9271d89
+lib/codeql/rust/elements/internal/TypeBoundImpl.qll 82f30a9bfc4714b458739a38e91b10ca5c814bbadf56ca1ac81893b0e1e03ff1 a9ced8f3076bbfc2a38cf42b71f208bbd1c192d8d4a2bd206ba8e71ebc4deb71
+lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll 4b634b3a4ca8909ce8c0d172d9258168c5271435474089902456c2e3e47ae1c5 3af74623ced55b3263c096810a685517d36b75229431b81f3bb8101294940025
+lib/codeql/rust/elements/internal/TypeBoundListImpl.qll db2c83f1b79cca056c6489ae523c1dc6b2433700da6dce39fddabdf7fb217dec cae68f45cf7c364a19d4bbf1bb8bb2eb3984b99425901b44c7f444a8652fbdcc
+lib/codeql/rust/elements/internal/TypeImpl.qll 0d544ff63fa7ef3ba6f1327e25df8f765455f0d266e58c59dc40edf4d7bc2709 5e207dbba81713920fd8f032f04e3b1884e0d6781748f89b59476b57cf2371d1
+lib/codeql/rust/elements/internal/TypeParamConstructor.qll a6e57cccd6b54fa68742d7b8ce70678a79ac133ea8c1bfa89d60b5f74ad07e05 0e5f45d250d736aaf40387be22e55288543bdb55bbb20ecb43f2f056e8be8b09
+lib/codeql/rust/elements/internal/TypeParamImpl.qll b88bd98abf477c87e6e219a97ab0191f4fc8e6c84c0dd1416fba543e6fc86a9f d22d269320c7672a68aa3e5d2d754a8eb732a8d1a28d676e86e6309df72a434f
 lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll 8dc27831adb49c1a47b9f8997d6065e82b4e48e41e3c35bd8d35255cea459905 6c5a5272d37f83f1c1b17475f8adb7d867e95025d201320e20a32dab1f69f7bf
-lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll e3efce7b67867ccc663fdc437f9df5e68487ea0205e80b3e22dc2ce7bb91d660 a6406d54d31a713484161e4af7fa590491fad0956e942df731df4350d5db2e52
+lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll 9346749d0cdcc3d70f7c7992c746565af7bc98c1788dc0fee8f54f83cc84ae0a aba18af12c354c47e4b90a729440de211e06ab1fbc4c24d6e460b66a60fe8d75
 lib/codeql/rust/elements/internal/UnextractedImpl.qll 5c23df7e448184d76ccab2c22757ace24663b8be2592a3fa2a44bef43159ebd3 77b0c9fe75a307adc08c422cc88423c5349756878793cf9e79c006c83b4c403b
-lib/codeql/rust/elements/internal/UnimplementedDeclarationConstructor.qll d6ccf867e9bb7c511ea77c0c2ef50b6a86fcbcf69d5e28952b46dd97ffaa4bc7 7cb2eb038b1da65e3a359f289583af9ac8ad366baf39b7977ff478b8e5232666
-lib/codeql/rust/elements/internal/UnimplementedDeclarationImpl.qll 2733841a03619458fdfff1aac11c93c82de712c95243b4f9d64b72ad219651eb 2a087037edf3da2b1f8a3942d9c3093e3710d0f8644215bd13a54ec3d3793e58
+lib/codeql/rust/elements/internal/UnimplementedConstructor.qll 70b0489fdc75fed389de8203947ed9c8eabb91373a1264eb2c8018ddbb2d9baa 0f2592c1697a2f2f913014ecd73b0e3ff1ec5b038ba1c3a22e7939bf8759e664
 lib/codeql/rust/elements/internal/UnimplementedImpl.qll 06771abc088e0a8fc24032c9d2633618e8e40343ef8757a68cc0a70f1617165a 5738f626f1f4f573fdf7dcd5bd57a0948d290ed89342b9160e95ef3c84044f9a
-lib/codeql/rust/elements/internal/UnsafeBlockExprConstructor.qll 1924127ed4b9f64812752b5f57c1e967f740fe252a7ed9cad492bddd3a2a7e25 a54065b28a58f46587e842f59320222e5477ee086c4df909062b60ccf57d01bb
-lib/codeql/rust/elements/internal/UnsafeBlockExprImpl.qll dae1704785c847b724ddde078b646ab7359bb8c3ca4cec1e79c81064bf32b37c 76e858c1362773591f17f38c8d0bbf8c10a64910ce6872bfaa7886e08fa2eca3
+lib/codeql/rust/elements/internal/UnionConstructor.qll d650551a1b3ef29c5a770bdad626269cf539ed0c675af954bc847d2c6111f3f6 aca9064ad653a126ab4f03703e96b274587c852dc5e7ff3fea0fec4d45993f10
+lib/codeql/rust/elements/internal/UnionImpl.qll 73177e3594986c5c908f282fc9c7c83a6af1200acaca5099f49c93cfae03a9f9 cbe1ef8fef39814926beeeeb1c8cdef0b7c761d80daef02868a1aeba55c95874
+lib/codeql/rust/elements/internal/UseConstructor.qll a4f790795e18abc29a50d6fbaa0db64cba781e3259a42cbf0468c24ac66b63e7 2fa288f073ac094a838c11f091def2c790b347b6a1b79407c11b10c73d6bff57
+lib/codeql/rust/elements/internal/UseImpl.qll 1ae372d892d66f00dda66df4b266454c6fadc50e83aad8f891006e4d7d56602e d3f2acd4e8a17d457af3c1431a738d4de299d50493ed91ac832d3a6de654c481
+lib/codeql/rust/elements/internal/UseTreeConstructor.qll 3e6e834100fcc7249f8a20f8bd9debe09b705fcf5a0e655537e71ac1c6f7956b cdbc84b8f1b009be1e4a7aaba7f5237823cea62c86b38f1794aad97e3dfcf64b
+lib/codeql/rust/elements/internal/UseTreeImpl.qll 37ad5186e1026f948ac00ababc0326c7ac48619413597498d24e03037a522894 a795578b41af1b5b387f298d05f00d62ef92a7ac010271ed85211f129e49d4d2
+lib/codeql/rust/elements/internal/UseTreeListConstructor.qll 973577da5d7b58eb245f108bd1ae2fecc5645f2795421dedf7687b067a233003 f41e5e3ffcb2a387e5c37f56c0b271e8dc20428b6ff4c63e1ee42fcfa4e67d0a
+lib/codeql/rust/elements/internal/UseTreeListImpl.qll e069d94d36d15cf1a58c5612257168578a3e64a633cf0a8031de392086903b66 c5a7b5d1066662f9f35de31f24121efe6abc824dd7b0db500633b2cd78b5cebd
+lib/codeql/rust/elements/internal/VariantConstructor.qll 0297d4a9a9b32448d6d6063d308c8d0e7a067d028b9ec97de10a1d659ee2cfdd 6a4bee28b340e97d06b262120fd39ab21717233a5bcc142ba542cb1b456eb952
+lib/codeql/rust/elements/internal/VariantImpl.qll 50db84a1160667a4441a55ec9687d4ff659db3ad8c2abeda4e96ec9c138c39e6 0c5159bf4a873e053eed48c3ee2f5a0ae5aaf5e0f5531cda0e0114e50e07c75b
+lib/codeql/rust/elements/internal/VariantListConstructor.qll c841fb345eb46ea3978a0ed7a689f8955efc9178044b140b74d98a6bcd0c926a c9e52d112abdba2b60013fa01a944c8770766bf7368f9878e6b13daaa4eed446
+lib/codeql/rust/elements/internal/VariantListImpl.qll 6bdb6b0ecf77300338546e49b115e09fbff0affd506afb1db6fdd3afbbf43a6b 7698705f4744e005b726aa42ae100d7bb6d63f301791f4f134024abf4ce29620
+lib/codeql/rust/elements/internal/VisibilityConstructor.qll 1fd30663d87945f08d15cfaca54f586a658f26b7a98ea45ac73a35d36d4f65d0 6ddaf11742cc8fbbe03af2aa578394041ae077911e62d2fa6c885ae0543ba53a
+lib/codeql/rust/elements/internal/VisibilityImpl.qll 8d111648aa4a0acfef1edb27a556a3269ed9bd0c3c8bed57e3a11d25a1158c51 08df8ef2943036be57735eeff96c9d5bd31db6fa859591f373308f18e35779b5
+lib/codeql/rust/elements/internal/WhereClauseConstructor.qll 6d6f0f0376cf45fac37ea0c7c4345d08718d2a3d6d913e591de1de9e640317c9 ff690f3d4391e5f1fae6e9014365810105e8befe9d6b52a82625994319af9ffd
+lib/codeql/rust/elements/internal/WhereClauseImpl.qll 5941ad385d54818426a821c49a774adc1e0eda5b25dcd03524f59b060192073d 61836db855454fb4a589cb9731ed9fc971fd961bd78165ae73f35e49ec092a83
+lib/codeql/rust/elements/internal/WherePredConstructor.qll f331c37085792a01159e8c218e9ef827e80e99b7c3d5978b6489808f05bd11f8 179cad3e4c5aaaf27755891694ef3569322fcf34c5290e6af49e5b5e3f8aa732
+lib/codeql/rust/elements/internal/WherePredImpl.qll 9e1042908a067abcb3812a4254edb9a0a33ae5d7df7c6e788ada6fd1ad9ee218 618b7530caaa6acd24f732713d66f06ed2cb732edcb6cb6e9e4f94581c1aa510
+lib/codeql/rust/elements/internal/WhileExprConstructor.qll 01eb17d834584b3cba0098d367324d137aacfc60860752d9053ec414180897e7 e5e0999fb48a48ba9b3e09f87d8f44f43cc3d8a276059d9f67e7714a1852b8a5
+lib/codeql/rust/elements/internal/WhileExprImpl.qll c44fb9d80d1592de199fb077e800cd238992550bf79067fe67bb2ef4ceb3d45a da48b1f09c940ed35f7516d29c5eee0d3aef1bb8a6ecade8b4aaa7a734f10bdb
 lib/codeql/rust/elements/internal/WildcardPatConstructor.qll 5980c4e5724f88a8cb91365fc2b65a72a47183d01a37f3ff11dcd2021e612dd9 c015e94953e02dc405f8cdc1f24f7cae6b7c1134d69878e99c6858143fc7ab34
-lib/codeql/rust/elements/internal/WildcardPatImpl.qll beafed1acce75687b17a2a0f987668e03904bcfa87ca891fa12ee7353c139187 f69c17260886a1b87dcdb3571b1a83a05aff5e146568876a86196986d0fbc409
+lib/codeql/rust/elements/internal/WildcardPatImpl.qll 231b87bcacde310efff1f4c19fadcfd65f974951673d71a8019575d91e610142 17ffba210fe40a03816e0835cb8d8b96c7d008251cb9064ca07daf3b1b349fbb
 lib/codeql/rust/elements/internal/YeetExprConstructor.qll 7763e1717d3672156587250a093dd21680ad88c8224a815b472e1c9bba18f976 70dd1fd50824902362554c8c6075468060d0abbe3b3335957be335057512a417
-lib/codeql/rust/elements/internal/YeetExprImpl.qll 9973783d10974093be6f11e035145f66a2f6f1f87e90d53a8c176bba96f16984 38955e65b5c41edf618f111208b7874e99671e88c47730f1947961dcefd6efef
+lib/codeql/rust/elements/internal/YeetExprImpl.qll 7eabbb715dc95aaa5baf482eecf28bf4af93e5845ae66382ff1835e9fd680108 6724868963937ad4d4506812e20333107478a707b52c936e1bedf1fd4e3acc58
 lib/codeql/rust/elements/internal/YieldExprConstructor.qll 8cbfa6405acb151ee31ccc7c89336948a597d783e8890e5c3e53853850871712 966f685eb6b9063bc359213323d3ff760b536158ecd17608e7618a3e9adf475f
-lib/codeql/rust/elements/internal/YieldExprImpl.qll 581fedb6f18bfa33e1500b8f053db56b85de9621324c2eeeb52c0511dbb59671 080d279523ae75ba6e97ff706949d723dde0a688f38036aaf61d278d55b04bf9
-lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 4727bde9eaa7805929421136c5144502ed2a8b5b7993f464a5563aa78247e2c7 295bd6a10cd436e09c5ddaa5a1ebfbf0386a4de0d88b13b8e569ca6ae51d9ab8
-lib/codeql/rust/elements/internal/generated/AsmExpr.qll 44e5ea84536568403c517970cc5209765c03ba7527bfe2207452729aa0dd2c6e 6f4b9e94dcaaf21d4b51287412acb3c5f1a1228a823a5e93ff730bc72b5adb16
+lib/codeql/rust/elements/internal/YieldExprImpl.qll e907bc6badee79b31f6e59d3c0110855fdcf3e4692aa078391eb9b1731250e6b 5aed36dcd3e661f22714d242dd6140339c1e99805815aff87d63a90272a6f83c
+lib/codeql/rust/elements/internal/generated/Abi.qll ada09c788cd17be8660a86322d463147925f0ceadd14fe66abdf25a008c55cea 5258ff6526327a18742aed8a5341936fe22ffdd42bef4497e95b0c7e3aad40a2
+lib/codeql/rust/elements/internal/generated/Adt.qll 73bdfb7ee60216dea006c9cb5083c8b852b20a863f12f6b8e18855e4e1932a23 ef41854177e3c49c215e2d13ccf16894cad24fed7be042fea74905af975c049d
+lib/codeql/rust/elements/internal/generated/ArgList.qll c1abda8f4b6405d29e42029b504781202280fd7b0a38fb243c5832d5cf1b772d 9b6fecac7304ea27bf138e273fbd15e3efe8c8a17c2beaa0ea75c954719f5cb4
+lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 0c01f5352168de713d33e3baa593f535984c3a23d884f70e251af5414ff068f5 5c7887baa84d53572294ee89a7c5ee3c44a9d21123862c35b317c99e66227f7a
+lib/codeql/rust/elements/internal/generated/ArrayType.qll e6571824838eec06392b6196cdf34b520965348c3c6c3d7ad1accacc4fd7c404 0e9e5c4b4aab0b3c2e5b0df6f6113fc791a0db056a383bd84f47119ee294314f
+lib/codeql/rust/elements/internal/generated/AsmExpr.qll 4c2f0e04d10e3cb9ce0b841f5267b1541afe40c823fd34ac2a438206618a94c4 136e16a9406b94ab6d8e60085a6987bd8dbd3b0a589c7ca1d0de413edac5fedd
+lib/codeql/rust/elements/internal/generated/AssocItem.qll f0d132b27a27956882b75a7509663fe9992570fe3b6c4636a63cce4c9cdaf2f7 a3849ce1c8f665f90c919c8c4b2c4ec429e33ad2034635828c25b045d2749c3c
+lib/codeql/rust/elements/internal/generated/AssocItemList.qll 4d13c3c32887452ac38297a55a70196def9f64d952be52057e47f9d24b418eba 0777e766f5d05a26fd2810b817d55859e44fcaae18c1a195e57e5f671d46c8a8
+lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll 18873caede89ee7adef5a1901bff77de43064baf8e3f07467f2195560208dacb c1001cb128a72bf24bc1c6407c70ae7aaf6d5a8134a546c1c0430d34305408fe
 lib/codeql/rust/elements/internal/generated/AstNode.qll 1cbfae6a732a1de54b56669ee69d875b0e1d15e58d9aa621df9337c59db5619d 37e16a0c70ae69c5dc1b6df241b9acca96a6326d6cca15456699c44a81c93666
-lib/codeql/rust/elements/internal/generated/AsyncBlockExpr.qll ff13eb92b2f95a323b117e6156e05e0adc396672952fb83b6cc4ac2eeab5847e a94308766ecc964677774bab2c700f698f8e19839c8f6ba99f55874fc45e726c
-lib/codeql/rust/elements/internal/generated/AwaitExpr.qll 7d430e1e118076a84d57b933e7856ded990661d891249cb7d3e7261b19fae4ab f0647be0d1410a388113cf8c5e154340d9ca32a553f02fbb5bcf089adcdb0311
-lib/codeql/rust/elements/internal/generated/BecomeExpr.qll cf1e51ea8224a58adfe89f4bb364e8d210d68e03fc5a15e4de7d6daf5bec3269 870dbef8eedae5e797476a83b3cea66747e8fe0c1d26de0b7afc4937a355b3ce
-lib/codeql/rust/elements/internal/generated/BinaryExpr.qll 527131b1b4fb903ad4a59264d6d1ae60bef3fa29210fb699dbc1ab3d4020f525 80a061a48d6cbca8498a706e20ca0f24691b98f388e3cf86a3d59e81324b0e49
-lib/codeql/rust/elements/internal/generated/BlockExpr.qll cf1a9724b35206856d5e771537eabf84b6e80a9b6eaecd883155b83c925658f8 2fa5fa1e0143103975f313fcd9e4ca47f3b65df79e0756810532d777447ce345
-lib/codeql/rust/elements/internal/generated/BlockExprBase.qll a8597d47d855fdba22b621e23bee1419d5b09ca5488d479f7fe717f95531e613 d87c6f5c27f9cd25185208db28d9b68ad3c520936a810c01e65207c02dfe381a
-lib/codeql/rust/elements/internal/generated/BoxExpr.qll 75c9d3c2048c0c084bbc669e40759378de63bb9f66ba30c03ece0eeba36f6662 dd9617196ff18b090eba143e83d035aa010b8e4387a16fb005eb136ac9d4e626
-lib/codeql/rust/elements/internal/generated/BoxPat.qll 683e35b60738f5adccd8d52d64b8a3256c75aa4ff8d35eaa31e8bc05ded43e64 04c4e009055739b9ac76f89dadd73d1147e8b6159b94926e09255439338132d2
-lib/codeql/rust/elements/internal/generated/BreakExpr.qll fa04e71c8365bf83ee9ed0c174cd21da879bc08720a7271436d10f84285df8ff 992601233dcbfcfd4706cbd5097650e2c54fdfb9f00001bfdf41ded7d44aa51e
-lib/codeql/rust/elements/internal/generated/CallExpr.qll 8207f7bbcd45d0044e574cf705d5e7d661baeacbe1eb4b968e3481e35d06bc3c 389547d5b466c6684d8f8460bb6d329e3f98eda5ef3b67ca8acaa0ef8c7ac94c
-lib/codeql/rust/elements/internal/generated/CastExpr.qll af16572f7c8406f05e47631927bbb4c14d3747803046964ce00d37a5ca4e9617 b0a633546abbb8b4061012b56c323164bef3008ca193666f14b7fb678a5972a8
-lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 5eb61b1ac4efba342aa0c27a6377b3940ba9c75e0065dd19b37b662ff39044de 92ed258d0550e2a6a969063e89033ca61db3172eecae866e64f03e355772c6ac
-lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll e93386787ab9ed47fd6e0d9c2449721aec1ec263889e99d26d7578e85fbae40d 0d0853020bf7db8b639cbaf02242b7f03e303929621a58a6cedf2144a356a99e
-lib/codeql/rust/elements/internal/generated/ConstExpr.qll eb75b50427850b8d14d2877bcac553fd1b2a0461359f7484223b1c4e131215d4 1772dc362a9c9651093883880478f3dbdf0d384b82dabb0682de187b754b4c6c
-lib/codeql/rust/elements/internal/generated/ContinueExpr.qll 73f8558720b4efadb83334370f38a8354f805609d56f7c2cc5442718ff8a58a2 b6d2024f340ba80d2ec32978def11beccc95ee28ff2eca627f8a60ab03de754e
-lib/codeql/rust/elements/internal/generated/Declaration.qll de0bccf895cb0187d570ce749d4c1b6dd6f747ca9f1d946fc319526bdc9397c8 a4e6ebe1b34f1f8ade683504f59e8820ffeacc09cd0d0d90701499d557c74c5c
+lib/codeql/rust/elements/internal/generated/Attr.qll be2280024194e1866470fd2fc04092ed5b1a2da08c018a5dd7c081f5a1842089 9149d1ae2fa107738168157f686abda25901905e895f0a356767a8674614d89e
+lib/codeql/rust/elements/internal/generated/AwaitExpr.qll e06c30e9ae66c74302be0daf4eff2449cdea82796f2e865d6728ede3ce262063 d6ef0451dd65929133c8717af366e766a964a8c5db036db523b47026ab5b3719
+lib/codeql/rust/elements/internal/generated/BecomeExpr.qll 11c86f7b891b01fd2f25147bbbdea8ab3bf63e261ea16c710e106f148d694613 62b0badf83912b1f23c8da16ad837fa84add47cffc37b6c332078aec35fdb481
+lib/codeql/rust/elements/internal/generated/BinaryExpr.qll 7f94f879f3b81b9cf8faf1ce0e0b4f44ee9fe824005eb6938a4b69468f44ca18 03d4afbca416b819594afa22ba16485113a12ea54c3ee979ee4235fa9c56e9e5
+lib/codeql/rust/elements/internal/generated/BlockExpr.qll 615d70ff53c8853e84b05e00d70a479e4481c72ea082b72098144794a605b6a8 713012095f4fed18a2184c2b9c9cf4ab7c44779d4fe69a308c68493e903bcee3
+lib/codeql/rust/elements/internal/generated/BoxPat.qll 6c31f3daae9505966cec065ace3bab860abfb17c619ea9275e3878ae1ea25373 c08656b0061578b723198b02b529a9fa98590fe16a35a657b34d7f788fc07144
+lib/codeql/rust/elements/internal/generated/BreakExpr.qll a8aee3397ecd318539c4f95039640274464c9e2fe5086d258acb1d281b20f018 3fab3c8ddb7967464a653f2dd6da84509aa01f1e01af94bf6b36fa98a1a1624a
+lib/codeql/rust/elements/internal/generated/CallExpr.qll 60024d892e3b53df61b211a672197ab0ca13b568f014c3e49aae7bf9210d1e11 30290dc80255fa9860c7ccd03fabb25b9858cefb04ec3f7ff74e568758902890
+lib/codeql/rust/elements/internal/generated/CastExpr.qll 3edf68cde1dafc6446647a88d3b58ccf5c948abc09f6311e0119636d53c515c0 dfb930a93341ac7daeb364d0e67551e910f8f6bc38c297908263e6e2e2e4d174
+lib/codeql/rust/elements/internal/generated/ClosureBinder.qll 27439d34951bd0ec33233fc7eeaf41161953c68220bd3388cd3bd1a8f8c32900 0b12dca7defc36fd5b62518d2013ea10a211c004b0601dc9fd05ba7d5231804b
+lib/codeql/rust/elements/internal/generated/ClosureExpr.qll b6eb0866cd0f4e7fbf49fe785b218b6b4ceb4d42356106da8507181e9012df38 d384d00eceb307d3965b5bfe62e010a1b9c384b5bf60bd34c1b6624e2f62a867
+lib/codeql/rust/elements/internal/generated/Const.qll 3021fc3e3254cae83daa31856f60a8d40d4e4563d3b23218924babb9d59d7d2e 99a43263380de8ea5725d5ca523bf87d1dc717dc573d9af62621896d842a6c54
+lib/codeql/rust/elements/internal/generated/ConstArg.qll 1838ad9d6ad0727fe95041dea6d1596baca5456effdf0865d32e433e9ed43fc8 68c2bdece406c1c2f6c38ee4237f2fbb026bd2cdbe99c301a20278a958908c22
+lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll aaa58a33eb4353ec76a481e0e01a07969f4385043d3717c92a3982f35fc45753 232e85eed23ac9ff1eb4f1445c234a137f995542699922eccb1e740c559ec450
+lib/codeql/rust/elements/internal/generated/ConstParam.qll c6008c3b02dd1595e4500965975e045ebf2e41405dc4047a8822cbec3a1e135b 4f5e6e69715741bc7f83359fba399469ece96e635fc502864e17baf585cb148b
+lib/codeql/rust/elements/internal/generated/ContinueExpr.qll d5892ce4fd708f125cb05e51b7e7a0652803f3ffe92b7e1f9ced9a9e9e38659c 4642f6138ac966981abad035c79f7190a789eb3b8ec9c63c0a710b37a406a544
+lib/codeql/rust/elements/internal/generated/DynTraitType.qll db0036acb30c3072dbafb865d4b61fc8e059f73556b6f759d14e19b0eeeaeb7b 9046c75b958a63abb47323b5b3a1382a43051d1689ad0e8e6b017001c922ea1c
 lib/codeql/rust/elements/internal/generated/Element.qll fb483b636180c699181c8aff83bc471b2c416206694f7028c671015918547663 542d1b9ae80c997974c94db3655887186df3921a8fa3f565eaf292dcfdac3c4c
-lib/codeql/rust/elements/internal/generated/ElementListExpr.qll faf93c4a35b2fc095b560a7b8040a5ae17c4520e690721f574e3458ae18bb8a2 c078fe0bb1221495593bda196659fcf5340cf5a12c79b7236eac22d8a13aa6f9
-lib/codeql/rust/elements/internal/generated/Expr.qll 5fa34f2ed21829a1509417440dae42d416234ff43433002974328e7aabb8f30f 46f3972c7413b7db28a3ea8acb5a50a74b6dd9b658e8725f6953a8829ac912f8
-lib/codeql/rust/elements/internal/generated/ExprStmt.qll 579cfe650fceb20b934e279bf5c5aaae5f0e9fbceced2b173d12ef6fdf150730 504a6a1833a8e3d2843eca3537a3c67350110291270b3d1807e679143d7da54c
-lib/codeql/rust/elements/internal/generated/FieldExpr.qll 6ca52ee7a69a8981b1fc744de11b7aa8960824062c1eeaa533e63524b963a5ed 5978553dfecee52281f8379e5608e0b6ccb2df19d41f9e6a742abf604b715249
-lib/codeql/rust/elements/internal/generated/Function.qll 0e93cee282c064584f56cb7f8f09d73f844920cf7cbc54d05a3284a78d522e77 421907a220cc24ab15eb6f00030394d510fa0331ec6fb3e732774be6c54e6e38
-lib/codeql/rust/elements/internal/generated/GenericArgList.qll f049e57e6552f98176c7f1cc472b694250b3c18937b56a539ab5915aebf13a81 657ec3cce92dd366b81379db510a6fc2939b83cc3d3b3a6ccfcee4c2830b105a
-lib/codeql/rust/elements/internal/generated/IdentPat.qll 4413dea5abb505314234ddf3356fcc50559f83c1497546d4278676f036cfb780 9b49a8300c02b68d4066db74eac62c0e09d8b5a83ecc3a712abce5b76ac78a56
-lib/codeql/rust/elements/internal/generated/IfExpr.qll 79e97bc73d085af8edbb7e8a8b783bc076da61f4f6a922720e02c25a9347f703 21bdbc5cd99dd000a981d138b92467365c8b0f3bb4cc510801e49231f6daa097
-lib/codeql/rust/elements/internal/generated/IndexExpr.qll 848daf6d743ed517cccfb265c94c13bc59bf25b2c97b01ec0ae2828c63cb225f 86e60a41615cf0a4f86841044fa24fa9c71a865733b86fca7326a7792b4cdeb4
-lib/codeql/rust/elements/internal/generated/ItemStmt.qll 2781fc009c4fc2974985d77731d0243391e27e123a30c06e852aefe37fa5e1bd 9ce19cc83d2fb948588a99fdfd24b9d90ab3fe1b1d28e8e211792aef9ac669bb
-lib/codeql/rust/elements/internal/generated/Label.qll c729fbaef51d0a440d99fed38b6f305f036346fa25ed8720baba43539db301b2 e49fa15579cf1316deee0a07d42ea27a71104087f0ef8972de3b683baea3ea9a
-lib/codeql/rust/elements/internal/generated/LetExpr.qll cfb18d9eaba43f0a8365f47e9430913bb6c8243f2bc59c33897876f1e02abf69 4fcb715a5badad5712198ae4a1eb1e43f7a6e9a94af9d3321e45b3ff0d5e43a6
-lib/codeql/rust/elements/internal/generated/LetStmt.qll 32c8845be2a741ce5f126139cd33beeb16d234dc8fb772dd4f18a0a8e31055b6 6cadc0e16d6bbed5dd390362b298eab788f2bdefb1919328f643e306efdd8f8b
-lib/codeql/rust/elements/internal/generated/LiteralExpr.qll 3646fdc5e5c8d62165a64ba91291d95e866830f45699eaefe59a3a760ac87d1c e9a7df22d10b096ca5afe110cb56f73c038c4cd74feff7a5bb368f2cb13483a9
-lib/codeql/rust/elements/internal/generated/LiteralPat.qll 815f8102a96ec94170277e262a8c6d11a1535f636f7fd9696cc39c2770ec3d18 1d20a8aab409a524b9018f7ec4b789e5c9b3284273141fedc079954a82a61682
+lib/codeql/rust/elements/internal/generated/Enum.qll e6854de787fdd10c57c8fdd55ede8aa0261d9e3629144e630036e72ff8934c99 07f7ebebe99cb717de1264416c3555723d7118cd1ae1977e1d8de5e0e7e37e43
+lib/codeql/rust/elements/internal/generated/Expr.qll b714c4d1ef42ac4010c0c325bcc0384e4b2fdf17bfc4dffee7dc847ed841c6e5 4b51b4b5ebf076259b0fecf1fb306e1a3b488557ac85134383e2a8ad23d0ed89
+lib/codeql/rust/elements/internal/generated/ExprStmt.qll cfff86fb1552742275c0b7ca244b3a554153aaf055e7884885c28121d79ae024 3b620102da074ccc3aff905a1ed79229654069cb2f2bbd59eda00633424c59ac
+lib/codeql/rust/elements/internal/generated/ExternBlock.qll b92413df78a94db12870cc52d06a403c044b75b7110387118e93a1debdd9043a 7ffeff9a0dba5d82789a8c0776d89f6ae2821de36dfcf740c807d6fa0d295160
+lib/codeql/rust/elements/internal/generated/ExternCrate.qll f2ce6c92410f7844502d26577c5ae397dc9652d9bf531396100e47c3de887a56 4b9bcfc8af817f26e9184347bda4b60e2a734f0e4d062f5bfd6b3e7b26d0365d
+lib/codeql/rust/elements/internal/generated/ExternItem.qll 851a0ebe12e73300f84a4dae213a2e9beb143946f3e741f4ada49fb49d458ddd f599e6da76f03be2cbb56b74a239a45fd074fa911cfd97bb6a466e88427e7284
+lib/codeql/rust/elements/internal/generated/ExternItemList.qll 947c16a4cd479757a6b39516aab4ae84c442177e9ec7a7e95ef1acce43c6e9d7 ab7a3bb55c37956da87c6ada71e0054008eaef586498bd01e785ada5010440d3
+lib/codeql/rust/elements/internal/generated/FieldExpr.qll b120542f90e45ffc72832475ecf2132c0ce1b27ee08e60dd307dd23173b344c6 938dc1c6e3c989e5c76c4a1851a47fb73d42c742e9c0b97fc22e2522a739be34
+lib/codeql/rust/elements/internal/generated/FieldList.qll ebd3aa1139bd79324d79e19dfd463a8647d96e470e5a1298f4a21e005b856710 0f9fe87948bdf3446671c336631483049fde954d4ab3d2c262d949a8ffedbe87
+lib/codeql/rust/elements/internal/generated/Fn.qll 71975ec5f7d069de290c173be1b4d20a7e730e41df70595056a707088c139437 76d11b23975f6ebc92bc8a4b5ccfe18f5392f7999162a5ec9e4dfc74b027f435
+lib/codeql/rust/elements/internal/generated/FnPtrType.qll 045be0c9f837b717a8faa1092dc4c7fe34619d5a0e704eaaa543358f458cd183 f09cf63a3ad6459b650a5cb1bad1ea77ec0cbe628d8d64250652b52694a38386
+lib/codeql/rust/elements/internal/generated/ForExpr.qll e9292d42ebe71f3d843dd1f0baa0c40e2a2cec47ece5b49be95533a7406a84c5 ec369c4bbbb51e89e2e3f89df2a52c021aaac181509ae583ab1cbbbbda390421
+lib/codeql/rust/elements/internal/generated/ForType.qll 7af224ae41775b33d034b674f65161bc2a5b660b64d036754883f46a6b67d1df 068202e2b66ab048a647bc2210885d25e8f04ed87d03c35578d8f480b2067e63
+lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll 09d8929b63fee13cfb9f8a2de204cfc864ff6ead4f65c85e3cc41bff23facada f86393ec1413b7972e77173dba195e0e9d745427dd7cdba598b78c694d131600
+lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 7fe594abecbac5cdfb762741766797cd5644419e911f7c9b74ace84bcf279e45 0369b61f40a7a7b8dcdfd36dc3ee949531b49662d4903f50536f80d882977ee0
+lib/codeql/rust/elements/internal/generated/GenericArg.qll ab1316af9d9c3db0c987a74bb3020cf7835ea264472b27c9a5c18d102e5f1141 02d08e22400bac7721b5424e018414f8734694181aabd26d1f5d31613cd8daee
+lib/codeql/rust/elements/internal/generated/GenericArgList.qll 215c29ff35e7e834598b836a7e70bd73e2e87326beb520a6ae10e914e1dd0bb1 1778f2153f37c8977901c4d35c7e57462ebbb0bba8612020e5f40a9d71d98b4b
+lib/codeql/rust/elements/internal/generated/GenericParam.qll 3ae8f4060d578c37f4b2bcbeef16484c44fceba070f5fef569e4b84a2b0139f7 ace1e7c7c5d920a27430b8859cdcecbfc536c9ec4814c1e4a03d28b904f29b35
+lib/codeql/rust/elements/internal/generated/GenericParamList.qll 2bd4aa05d99872aba5c76743edc69645890d3e93d04d8df41a7a1ea7902eed39 d23e1c7fafaaa70a2d8ced7ed2e9e8b2c4225d5b0ca8cbb8c62a17673bee923a
+lib/codeql/rust/elements/internal/generated/IdentPat.qll ad4a1a539918580e5bcc0a389e8193e17ee6c48e68cff349d5bfc136f7721f4d 16fc316a4599416c72a0d3438c63beb733c4e6c8572b60a0ca8bb49794b1cf79
+lib/codeql/rust/elements/internal/generated/IfExpr.qll 5224a47acfc89dff4088a3af58b9d708c2e628f488fccbeb06da1cfcfadae536 11cd8bf49c2248d534930b1f8f48612a09a90f7417e724aefc06cf88da4ee028
+lib/codeql/rust/elements/internal/generated/Impl.qll 6ca9046bb39ae1cb74030e22d5be14a07c37ed1e6ffd04af6274d775ecdbf662 b8be017e267f1e94592803faff396424eb985e06aea3e2852bad4572c3bf97a3
+lib/codeql/rust/elements/internal/generated/ImplTraitType.qll d111ffe6653ee8e8cdaba117d4cbbe003acd150bda0ac795aff8275214c7e066 339887a00c22c4e7f2031630d360f900330a52998c3d2ebbcc22bee903abe53c
+lib/codeql/rust/elements/internal/generated/IndexExpr.qll 30694c6e669cf38e8f5cbc832d177e28b8100e560fee9836b99b01cbef58733e 80909c48efe7d41d78af290046ea8993f381d62bb060d380bd4d93bf2f76fcb4
+lib/codeql/rust/elements/internal/generated/InferType.qll d1e21161c262af65379c198c60dfc7379a9163bf41edf3935a1f8db1be20715f 5133e485a9c9ddaedbc32ba32162bb9db90ad1a2013a09bc82bcb9e171e1b26b
+lib/codeql/rust/elements/internal/generated/Item.qll f9e954d39375e9abd604a877046641f1726544e73f7f2dd6d6d35a339ad4060f 4265dc3d91ddeeec236f6ec436fa6bb09cd0ff83cfd16db02483f904e231dd45
+lib/codeql/rust/elements/internal/generated/ItemList.qll cd230f40f075e57ac51b4cfaf18682de3c042c1c3aa8ab3bf516e4fa9d4f83b0 dae003281463725de231b697ee0c7b7b10c4b4dbfa641eb412165aefb11d5c4f
+lib/codeql/rust/elements/internal/generated/Label.qll d156dd0553c770f7d2ad4e42f22066b0f87d2f871bc582953963c38f39716435 59d51cc70021aa58479f11b10815d735e42251e60977f6d230e81dbafe435da8
+lib/codeql/rust/elements/internal/generated/LetElse.qll 61254c4e7d2f84482b5551d065bb43aaef55a8b5698547e2e0fe8a038932050c 38736f60234e46fbd1c0f937992661f9f56b40d8be7ebf79e33f7276d005c7a0
+lib/codeql/rust/elements/internal/generated/LetExpr.qll d99c97aec6f8039a853c3aa11281ae39086097500570d051c6caa20d708c63fa 8df2c915b095576777e1db778cf1f45a7bac9c58344492e65f9df947011c473b
+lib/codeql/rust/elements/internal/generated/LetStmt.qll 1802caf46480de14a55d0b70e4a5d95a73851f539f2d03aacd9f337f9186657c 72b1352adee1989a23b83b0b8728838f6935260e24cb1c048a80a659e4394e2d
+lib/codeql/rust/elements/internal/generated/Lifetime.qll b0b93ba261d21c5f73c1ab1cb5e388c4bf8fc7470f8c1cf40442e903dddf5a79 4bbd340f475ad362a2a9e7979f2bbe0672b553e1201c5a46a9ee4029f5466bab
+lib/codeql/rust/elements/internal/generated/LifetimeArg.qll 6470c3dcec621462f72f0423f5a54aa713e977f359dee97853f8e36147ffce67 8e12b9b24a04bc719393c2681da0dba3882c2c8b3918cf9cf6956dea3e0f5047
+lib/codeql/rust/elements/internal/generated/LifetimeParam.qll 55943ccc6ed1cc8182dc782917a795cfda2270c8d605c39a41530a826cd4c4f2 6c8c6894bc91eae551af4ec88de3e20b7dfec659aee8c4b47311e6172beccae5
+lib/codeql/rust/elements/internal/generated/Literal.qll 40ff7f29da0a84d0ea7277c3c41859b436302a233a9e843bf5ff53e239fce51f 027ee57310beb32f7aae0a48d7918bde3ec51433b7c99be689474fc1c4e9803b
+lib/codeql/rust/elements/internal/generated/LiteralPat.qll c22b3f601f5f3e2869fb53ac1512c049e26f229d92e590dd45e2cf95b82e31e8 37a7c1cfc67887ef2acba311ed1da42ae7040af24ed726fa0c6733c2528fd825
 lib/codeql/rust/elements/internal/generated/Locatable.qll c897dc1bdd4dfcb6ded83a4a93332ca3d8f421bae02493ea2a0555023071775e b32d242f8c9480dc9b53c1e13a5cb8dcfce575b0373991c082c1db460a3e37b8
-lib/codeql/rust/elements/internal/generated/LoopExpr.qll c53647d2fa68e306ffad94d09a4fbe3cef9d91c117e9748d131367cb0b38e0ae 655c8bc62504ab4b0bb83695806d6829691db10794d2e066f7fe0ce2e433ba76
-lib/codeql/rust/elements/internal/generated/MatchArm.qll 510df94f412572f4c9ed664d4bac6d4d4fb9e7aca7e0eb2d751722f69f9c7af7 1421ea638a9a0bd48a4b226d0bf6a7a993fc743d4a27a0ebefc262415a206f95
-lib/codeql/rust/elements/internal/generated/MatchExpr.qll 1782c9718f3113008f9851138eeb79d52d36c5260166d806ab529ccac0d0e31c 91bad4dd7f3dbaf2ab51681c92e9f7b1b748b887993f73d68a79b279810b28ef
-lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll bee452774c76b0756e6597c410d3bf07787dd2aebe8e38639296a5379efadec0 f28798085e3f933f7ba7e3888410c049de57dedc8e6b4526b8041ce901e7bd0e
-lib/codeql/rust/elements/internal/generated/Missing.qll d33b611d2e4fb92918c380f6182ccad1372bb7d2560a11e2c4922aeec2de7796 35d1fb1aa5a9b2f51ea9d78013db1012e3e42f1847439009c550bf34b96c3755
-lib/codeql/rust/elements/internal/generated/MissingExpr.qll 9cc91c717f4fd4c7e7925ef6f46a73054861493206b0cffd04318ccb2f31cc3c 15aef97d233d3bb2ad0142d7bf35a5d808dcf698c4a983df29670d0289931816
-lib/codeql/rust/elements/internal/generated/MissingPat.qll e09e48e685ae77e5f61986703aedb97c333b9822b761fb6af1ad6c2b7254c6d3 2e9ca662e8db89d14fd73160e11a9c867627c934d71f3e2a750cd3d08e210359
-lib/codeql/rust/elements/internal/generated/Module.qll 6a5e3d357eeb3fa594c24cea0c5ebf8504d7a2745317a7457ad5f599e1a2706c 027d03136c17bbb2fdd5d21df581328b1f3d96a76c728c211c77614b99993ee3
-lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll fa5f1983ac417ca01046b688a29edff4a1b9364f5bf2da7f4b6d1494b15c7fac 37910c2544e48a6d5d4b87687b6324b72ea0408b530b135dfed3661fa32e2fbc
-lib/codeql/rust/elements/internal/generated/OrPat.qll b11fcb28b6dfb746536a46ab82185d63dc81bcacbc42c689a88cc8eba7a695a7 0aa5d5452a14d5fd20559922d2c9420128b267b13b3dc71347d9d67ef7fe3beb
-lib/codeql/rust/elements/internal/generated/ParentChild.qll e5e3dfe67e92553c3bed102e1217b44689c956fa165383baf57b74121da69b90 3c231960313227cb88d80dff8959f4d1a68ac9c09f3dfe5747008b7497609071
-lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
-lib/codeql/rust/elements/internal/generated/Path.qll 1e9d2afee3a78b2e17bf0b93d750f4e9b1120066484ea1f8d4403c6f05ae5658 5390cbbe34e3ac77e5e2d61fe75e98dbd804d45fd14e4598ad4f5623410be518
-lib/codeql/rust/elements/internal/generated/PathExpr.qll 9a991c48ab2c500eab9363e05aedc79253d55b513a499e262ebd3647d5482909 e468d9df09d64663831935b0b6b99c8681afdd38e51786e4276cd6112e29b3dd
-lib/codeql/rust/elements/internal/generated/PathPat.qll f2c59c5a234692aff2813d75338313ada31490b3242ef91bf0842aabcfc544d4 378fd620a14839f8447d9de48d6e14cbbc100f14e47bbf3428fe2279b897b6ac
-lib/codeql/rust/elements/internal/generated/PrefixExpr.qll 0215bb92db1245b0dc7e22aedbf5aa8e8e49400f9af773e403447b2ac87b3cc8 1dc44e800de19e0d9ed158c88e7833124121058b665fea9a4681e91bd04b49e0
+lib/codeql/rust/elements/internal/generated/LoopExpr.qll 8abddd3e3403ef8cd6854df07dc63962f64a4ac24450285285987a22af648b32 a822e2767a552944184cfb4f8f7c6db8741a49c05704263e4bd7c0cd4046024e
+lib/codeql/rust/elements/internal/generated/MacroCall.qll 0fdb6642a8e064e59c4fbe98e419fd5c018936a48b9447f4253ddeccf82542e5 de7c3915b84719b182f6471b32c57a2176f71a6ab7301c69215a7bf0b7981422
+lib/codeql/rust/elements/internal/generated/MacroDef.qll 4d3e70503fd345203faccc36363a74aa75da5d1f32b5ac7e789505bf710867d6 3d5dc863c0d77b97610ce87c16556ead1a0a1e09b55991fabf7453678e05f39c
+lib/codeql/rust/elements/internal/generated/MacroExpr.qll cf6ee2d287ec1b4cdfed5bc0aa3bb2419edbce11d255b677893638b6bfe6550b 513bea7d4eef4f0d8bea5dfe7ece05f59b4e03bdfe48bd724d97d1652eb8ec44
+lib/codeql/rust/elements/internal/generated/MacroItems.qll ec02912230762f2759c3ed97ff52fded62ed14fb68d0807c8085a85152a5d4b1 c9cc4f8f0a1d63787995dde173f1bc8ac25351faa66b1d323e2ac1c894c9be85
+lib/codeql/rust/elements/internal/generated/MacroPat.qll 7b1a0f02cdd9592957ba65623d392aee1eb51654a0ba024a3f09d124ee113f2e 0ea48a47635bfb9c5066b7ca4822311bef725f92950592491eaad47b771bf0ef
+lib/codeql/rust/elements/internal/generated/MacroRules.qll dfc1d7b91c0aa90b4c043b501f6aebe75b8b3c75f25f5645e61353739967ecab 62bdd514ee595ef80f744021d16c7d0f95bd8e52286bd226d02e3c3ce9e5f977
+lib/codeql/rust/elements/internal/generated/MacroStmts.qll 502cf5490259edaefeda30d00371a9d58872e8bfcd82fa4a30a2a1c510662949 91672ea8c4c0e1e8ef6c9628e21169dfc873da4424aaf544a3cb2b9a2c523b28
+lib/codeql/rust/elements/internal/generated/MacroType.qll 9313727e25831c581e87c58219a8150187ea55e9dc9fa7146677e68f8cb0df1d dfb8571d8702213d0f092d815d36e90267b3bad45506e6ae193b45e9a0fc3171
+lib/codeql/rust/elements/internal/generated/MatchArm.qll 978d2b019dde1299885bde894388e0aea0b66030a6129a57b8ddf3efbbb153d0 7ec3a2a6a691b4a46804220d1eac31d562178677e04289b9f73ab116e8cb3473
+lib/codeql/rust/elements/internal/generated/MatchArmList.qll 645cf17a5d585106911b6aad573784dc5770d965e10577a1b90ed4a68caff231 b24d8a255568878c9b14f14b889e819280a244afea73f87670a127142a948749
+lib/codeql/rust/elements/internal/generated/MatchExpr.qll 83faf895e2a5517855825c1fd9e308f2f7f3664fdd87e4a77f4aade0fd704239 93bebedafc1781e01962ae3bd44c82e66a91aaa54ffc2847ace834b3d5d6bdb1
+lib/codeql/rust/elements/internal/generated/MatchGuard.qll ffc296730932710f0da0332cd8563f6ac1eff5019e1625a4ab7dc722755fe5a0 f04d4d5c7ab5ea53b461a690ac6f13174aa39daf157788649bd7814df5b07b11
+lib/codeql/rust/elements/internal/generated/Meta.qll f729fe8541204780f1e3827fc81b947023b06400d912236f673505ec8bf3d654 70b13073d38beeafec59a37fc25bf9d6bf28493f147333d4bb8a0028b3a4d345
+lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll b51e72bb078e8a9c79eef9db875b289fbc4781ec75aa6217357cb3927e5c9375 dca2457490758422f49e5590aaee2848c521c2c5218952dc97da8b7f0f1e57cd
+lib/codeql/rust/elements/internal/generated/Missing.qll 16735d91df04a4e1ae52fae25db5f59a044e540755734bbab46b5fbb0fe6b0bd 28ca4e49fb7e6b4734be2f2f69e7c224c570344cc160ef80c5a5cd413e750dad
+lib/codeql/rust/elements/internal/generated/Module.qll 2ec10715d2b372368f698f6262f4c9d06958c7a9dfacdc73d29cb2c5f624643e 34e92b85940e83b3eb356f51434c60d36286ad4af560ac7feb4a3bd1db74a9b7
+lib/codeql/rust/elements/internal/generated/Name.qll 4bd864422006d5a5367017bf12a23f055b07acf8fe382ba8155bee4937ffbf57 60b872a9fd16f137db473874a88adb7616e2ff5ff5f7ef7bf8c155b40184713b
+lib/codeql/rust/elements/internal/generated/NameRef.qll f764015191fa4e3848255047e6862258eb6b994db1ce2dddc770e146c3458854 1747437ed49c40865b56e355362011c9d54b37951878aef92273c881cb3afa8f
+lib/codeql/rust/elements/internal/generated/NeverType.qll 7b1546112e9c8c2c8966b0f81c3a2f2225df1b2a3de622c766d21576f0b1c9a0 f29da50b29ceeb73b383aa224dccee54de4727a183db78e8f4d9813903644dff
+lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll f3a43d249351553b4070d898c480e7fecec7319af7ccb4a77a3aa7a70d833f02 fbc462759d7f8dcedb94b7d4ac4d3c79b31e2c9757eded1b19d7d50e7599e879
+lib/codeql/rust/elements/internal/generated/OrPat.qll 1191b21950c8955c63e54bf42012f2b21323e4d1894c5a4a3ba73949bcc6a048 2c385fc397a02a50944c57ef90d3f7db4445cecc068e0fb7a3dae3731bf6991d
+lib/codeql/rust/elements/internal/generated/Param.qll 6392a7087b6a7d6b832df7bb484837cd2e67e36537c87bedc3d9c0ac424c3dd7 9a2a70ac9de392f3cd5a12c316705332ebf9a3c90ca731cf9d349b74e76dfc6c
+lib/codeql/rust/elements/internal/generated/ParamList.qll ff7f9c67d1d85a48ad2a0c6027011414682caf84c1bfeac4f0d98289dbd8cc5b 13d4dd1bc8c3d04547905dd1e4588baa15f33e85c743b3e09666a02f58cbc941
+lib/codeql/rust/elements/internal/generated/ParenExpr.qll 2b16c61f9efc534d182be3da010c92e2ec9ff12b1b0252d4d90dc9cda3eb3a28 cf487691c5badcf389ea110b15bbc74797194d3251aff2fbaa8eddd7959471b3
+lib/codeql/rust/elements/internal/generated/ParenPat.qll c79ae30c86d401140d44ff574166b547c5f73a6fb73964eec2e1797a36e43b4d d80595a9e85ef0d3d9543049a9d1eb31c21f36d8fe3b79480f87c4514c67b67e
+lib/codeql/rust/elements/internal/generated/ParenType.qll 963ba4016baa18deb9073f3611c790afde314e09d21c5c038da0c4b9dbf74c3a 2dc9286b1af4ba7c45684b4c35779ebd3dad8c5a90feb480225d3c2c75118570
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 68e6dfdb37d501b2b4949498d1c56aca04f3e689b5baf415df2b5ad92ee26260 3e31f8612f4c1e26f089afddf91ec1f252fc6904805a8168799638adeac658de
+lib/codeql/rust/elements/internal/generated/Pat.qll 006d7a3a13ed7831afca4a831883047ac82b37f5cd0592ff9b08d60b82c5a0f7 a891211a8b608f850c7ecc155ce6d2c633f9ffc7559a5e73dd69266e10c08548
+lib/codeql/rust/elements/internal/generated/Path.qll 9df863c3ff5af00f402c6d9a4039db607ba71d633709fc3c483f87b4611bdd44 009a7252c221aae4e9be09a8ef2e09778e21a458f8aa5e431ed4b2b63b297373
+lib/codeql/rust/elements/internal/generated/PathExpr.qll 6fe87f13ceb7c12a8a1c26e0b5c9a484dea18566dfb5a48e557a9722c2034ea0 18c75182032e5bc8edd462f91636ddf4193a84b67c81ba13d4058beb9135cdf2
+lib/codeql/rust/elements/internal/generated/PathPat.qll 34446b975f479de888d377416debb12273737f193abd85e9950c737b2b912db9 00afe73becee1211596fbf345afd9c25555a0daa5e6c91d9dc1713a31f2ad817
+lib/codeql/rust/elements/internal/generated/PathSegment.qll e6dd11ebcddc82e302d98b8930d453f7db1123078993b16f014a25633a5b338a 05b3891095ee781610d0fdce71b43fa3add94dd92ba4f4cb3ab067e0dd227d6e
+lib/codeql/rust/elements/internal/generated/PathType.qll c8e238ef0bc6304322b9bd0b1af9055ae591b87bc87a3ec1cc3c8c638ed70d3f ba7a700054d997e6bad047a23c0d31abc130818009866d46922a1ea9f56a1bad
+lib/codeql/rust/elements/internal/generated/PrefixExpr.qll b4a4914c5eb4d049c6279be25914a042f81cc498f3af93cda7e5c3a5350ac110 9a1fbe4ee59dd1cde1aa60db09b9e698cec6f40e400b81378dd81efd49180a8c
+lib/codeql/rust/elements/internal/generated/PtrType.qll e2755a7a6b24950c895f69c56fdd78366a0bebe6ab733f2a1c36ba9f391db6c7 b4c2d5dddb5ec24d157f11eb431bd3434904d209a8d0a293d337267913eefa1a
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971 dc03515d678ba052c2ff2dd9f0883e0bce54cac740ba9a15e5173f292c1b6971
-lib/codeql/rust/elements/internal/generated/RangeExpr.qll 03524a5a132c0728d90b95efad90fecbd899257d05baf519c58c2f95af1b59c5 1f3642396c461a2a42483368cd83eec12156907e833ac16b96537f9d3a995fa2
-lib/codeql/rust/elements/internal/generated/RangePat.qll e69d9a50eeb139016e70b7638b80c1f7717b96950cef7a2f93baed76229d6070 b374f138fa12e3584081edd95a70ae9d5c2bc3b9aa173c557041925758786dbc
-lib/codeql/rust/elements/internal/generated/Raw.qll d876ce05f7dd89eee1677c52f97b84c352705f63e6382f07782fb2a34938fe98 9a811e7d876e8fffd3564787221e39f954100abc67a6f550af6f7e1b70e44551
-lib/codeql/rust/elements/internal/generated/RecordExpr.qll 767709332b3c497b5cffad77dccc19ac361959fa05f3af2636a1d068d582414d 943216d8dfe6c0a18449277505949391a9102381a435885b9e25c2dc841828e0
-lib/codeql/rust/elements/internal/generated/RecordExprField.qll dfbb37de279e7eebd8595bc07636211be9291c1e05c268fec2f079f239d434e5 fb470184a4086c1e6bdd953c4e52ddaff58db53376c0bd8afce04523c521013c
-lib/codeql/rust/elements/internal/generated/RecordPat.qll ab85509f51986c4f8b930f75eabc16bce19fdd82ad6be3fdb205b6b177bf4bce fafcc71b072959b07ea350b731dd70cacd2ed04db370b900f64e3369203b1b11
-lib/codeql/rust/elements/internal/generated/RecordPatField.qll 8765279cd5976f218022fe64b6e4da794fd29e27e56d35c23ff14963b450c906 bf5fe1df50611ec96856b73759d499b83bc760289ab3eebe63645fe9c05bdec2
-lib/codeql/rust/elements/internal/generated/RefExpr.qll 98427bfbb4164eb22a8a97774ed840d22ba59ad643e1fc0f6d2ba59cebdf149d 225e893bb080b309423512ededb8b7bc1e863e621fdd4e0ade42c8b349e34bde
-lib/codeql/rust/elements/internal/generated/RefPat.qll a95ae4c8fdab746c117a6fcb1fb035a5e38e2a48f03aff1c351dc80c438ad0bb 4b6751cc9c17712cb27631d9356d5673526d1701a6883a3fc7dee8c849f00213
-lib/codeql/rust/elements/internal/generated/RepeatExpr.qll 33a0a834cf754ac46ff2eb076c86a503a622205fe00371e7a994f16d3ae297b1 325e5244a1be57ca81c68096fea8ee010c850ab05721ce83707685553e1e8cae
-lib/codeql/rust/elements/internal/generated/ReturnExpr.qll 54b05fa1fc0318647d9b0eb109ff50671a8f5cc1430739dd2f31053546876e92 7898ef9749e17656df72c81438e1b7e3fec50250be427d85460d411b566e8acd
-lib/codeql/rust/elements/internal/generated/SlicePat.qll e280c505a7bd84ef2e5fac12eb45402588027915b43053604c99f78030d2b44d cd97d24afe3689f7f153f8660fa817949f7949d4c30a531f701fd5f7917b692b
-lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
-lib/codeql/rust/elements/internal/generated/Synth.qll d9e3ea792b3f99599aadbe4643575fde58b7d9962e530a94568ad1929fc3badf b9bc9d8290dc8ce551664e872b6e6332b3034bd839e5e7db79d26d32a1862ec4
-lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 119d55c15ed6be217168c52a544db614d06ff14cca6d8879ac17594b26248d60 119d55c15ed6be217168c52a544db614d06ff14cca6d8879ac17594b26248d60
-lib/codeql/rust/elements/internal/generated/TupleExpr.qll 3dd185325b505aee187dc95fd9938d8ed7732e41b102d0fe71ba643e21d3eb9f 1b1c4d0748cf90dc3e31872bbf7db9f4073bff4620b1b0343e4920e609057dd3
-lib/codeql/rust/elements/internal/generated/TuplePat.qll 6722281a7729bf52a4d5cf4fbf4c9ae01e6686775c9b9e82fb425eba19618236 2088ebaa7766b79a3b3f2f12c967f6cca387d4bce42585534fa7f20ed00eebff
-lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 7426b8470c33c63d6e62ab6d624f35550c1601037c532e9c157221f622688d26 a40af206efa4c546f393aec49b49f9e4caf06fa79d7c875dcb037c2f22d33e92
-lib/codeql/rust/elements/internal/generated/TypeRef.qll 2d46f2e1db65cb3a0798ebe8b59ec382741098d6ee5d3421ce546f1fa0a0c69b c96d8bb3656f401f40711979f7b61064571cccaf975fd719b2857d00b2f265f9
-lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll 4f1d22eb05d25a30d5ff671f3cdc2011eba7c9e49f98ac3fd41cb3b1a418eaa9 ef1f7e0e918dfffe8c15763b3a392f651d5868b9f90186a906dcb5b2d94a7b0f
+lib/codeql/rust/elements/internal/generated/RangeExpr.qll 0f61bf28ff23e62d2aa18af820a709fbd1e5aca6e4a1c6b5e3c27ab46f4d948b d4d63c2ad2b70cdd016c4d7d6162a8452a76b014239b54bc9913fe2fb4823356
+lib/codeql/rust/elements/internal/generated/RangePat.qll b1706069fd783057b86ec574a85557b854c046d17986230f25915ca0ef6f23f5 ba731c27bf5eb49f053f06e1c66cef0f2430458e47316fb65d13b8738dd09966
+lib/codeql/rust/elements/internal/generated/Raw.qll 26f631e740a1780cc68a0e1a25bf6148e643f16595496bce7dbb5698870c37ea 9b5a9fa9e601897bd0e9e486954b390894dd57c8cdb486e8fc0dee411d8b51be
+lib/codeql/rust/elements/internal/generated/RecordExpr.qll 2bb4ef1bacf9670fe4cf1e5be5dc45f1b787f0659e885f8152b5d4284f9d2975 991e9e6a2e68f3c066fd65ab1d9d5fc8065c70c80d76c7ad9cd52b0677528f68
+lib/codeql/rust/elements/internal/generated/RecordExprField.qll 81bd5f571ac021117c349a50ace92937a62df89cdf7eec10bc9a7db0699b015f e3c90ddb365820c81babf391407dfeb5f5c6a28ce781d81934e42445ad0c0531
+lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll eed92ac7305b53090d12eb64b882815f10c862dd35c6b6952c44676a4d992d0b 22ef8801700874012f3c67449f5a80e694fb8051bf622f7e99ddc7d181260332
+lib/codeql/rust/elements/internal/generated/RecordField.qll 8930e812d998abfd16485cb5135531091fc6121c6a71c619715dff757d68b859 5f6f9ea3f234a3cd3d756242f41c3692b7f0f9fdc961df0715274d33c01fe89b
+lib/codeql/rust/elements/internal/generated/RecordFieldList.qll 925b941cfda35def43b37a982e5648f45497a3b6e4805cb2a8bd7b8479f97d6f d0acee1c40e16435a4f45b6c2d834eda308c49d7bc4a761d0cbee1e987f16d60
+lib/codeql/rust/elements/internal/generated/RecordPat.qll 4c5c4d216d85b131113ecbca9e1bacb4dcb9fdd2d7fb75ac8a00757685e0afea 66da55f88774d831a94547053defb0d343bd1330b543e2bc8d966ef90f00babe
+lib/codeql/rust/elements/internal/generated/RecordPatField.qll db8a0a45e9a24e062687339d9800965bcd8d53e7d82674969af9d17507f63856 5e9f5406494b708b020199cdde5869c0341fd7ae01e68eb638077c5ad678e9f9
+lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll 091843c79f5a5f311d82da2e6b3c4927ece8adac379d741a65fa382f598776ad fcda9a27dbd830b1280df231347a26ee841309d2161524d2003b08995f209609
+lib/codeql/rust/elements/internal/generated/RefExpr.qll b15c820c21b2285a35fc669d8df48887688602f36e47a87a8771d659bbce27e1 6a4ab6df06dbc1f7602c0a93b1062659acc6c71edd11299f3ef88189f7c3e45c
+lib/codeql/rust/elements/internal/generated/RefPat.qll 94db972d0879c6f10b5d2223d95109e7ee4c0394602e54f0733dd9e0aba6dc0b d2933b5b8beef7057a01299ce120cb8585fb72166574a3ddd69a44019bc0cafe
+lib/codeql/rust/elements/internal/generated/RefType.qll fd5782285d19f18455c3a51f107a50c3838561e1c26c863c748d43eda8d16a4c 83164f1ed43f56557b889506a5efc1f6ff5dca3f4e96355b70c42aab2f9e27c3
+lib/codeql/rust/elements/internal/generated/Rename.qll 9b6288e058229406ae9ac3574cff29ac79cf60149f7969249e73c26f2bc622b1 abf96eb6b15b8aa8e51e66d526c20c71fdd4e6375354f3dd597f04c5cf56d6e3
+lib/codeql/rust/elements/internal/generated/RestPat.qll 55aa7afd8675082bc879458205a18c73234332797a6ff9c3ea8de7af1cad7182 902230cb2818bbd44390c67df2e604cff913b6afdc17ca0aba2c3b0f19fb2836
+lib/codeql/rust/elements/internal/generated/RetType.qll d1ec0641ca11918b832d55919e7a17cd9586b11a1aa023328bb307282790ba55 2047fa6bf6c7d8cdc90543483050cc83da3370ee16cd63c9db3cad2c10274f6e
+lib/codeql/rust/elements/internal/generated/ReturnExpr.qll 46c194907f0f6598988e79b6519d9d0a19956fe482c93e6b0b9a4a0d72d43e7f 7e51eb5dc1251c67ba0afa8e70a1ba6862371aa7b6918126638e3890725d502e
+lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll 423a15bd9d6f427ca06134e51ddfdb23a7c29cbf275dc55bf1367bc63bf73e51 e0492b85d829c0fc5c40f553c2c598a3f151c9798e517717575baf693636362c
+lib/codeql/rust/elements/internal/generated/SelfParam.qll 2b9f6610c02d49d7997cb0cff6a2cc108c737a00b32f36aa88bf67d072349f66 8f7bae1c24e98248047462c7b2e5e839e749d9df5d12f1869c3539fe8ee18df8
+lib/codeql/rust/elements/internal/generated/SlicePat.qll 9b330e396a1721f8bab5326486720debba2279393a88d401e0afa6397e9f48d5 9012f47588610e19c816de896633578ee089247d6296c5c2f44c69a7930940e5
+lib/codeql/rust/elements/internal/generated/SliceType.qll 1ae2a812450333f014e0e6a82c4db5bb442d9a1ec6c1211c287162f010985d86 07f8d0036b59871e29e96da12aaa333e1d5ebb8dba7f9c7fb4087efdc20a256b
+lib/codeql/rust/elements/internal/generated/SourceFile.qll a7670e531ad818f273b6bd3e0c581d863420a745a5572792002764e376e912c3 cbed30f759fcbbb348da4c1c4e0e1eaddf2eb6368bcb2d203eae275c78c5eb0a
+lib/codeql/rust/elements/internal/generated/Static.qll ba656f9f876ff57ff1800cece74c19becf80c96d0dcfc2d6d817d9a5007c956b ae9bb672929c0ae39e288e48f8242e7f184477bcdddb0189450b392142308d54
+lib/codeql/rust/elements/internal/generated/Stmt.qll 960e85930e7b1d75f1f0874609d8d841096f6e3841a1a1854c84e28b5bbdf95d 577b98a72a3bc87cf8c4cc6c2ee0b4439601333297db15c4d116b124c31a2ee6
+lib/codeql/rust/elements/internal/generated/StmtList.qll 1cc19cef831648b7a9888c9dd5cad173a1bb37269469d74d433dec89351306c9 da5db9a60c7851bfd9aaa8f23f92470f49fd93d140e060c0b6b2f8e9088b148e
+lib/codeql/rust/elements/internal/generated/Struct.qll 53da640778d6a5688ac06009c15f6279f111f05fe5c01479fb354dfb670b5b8f 343efdbce1db1fc0081b0416922bb6390caa52e0f187c4482f623e790fe9afd0
+lib/codeql/rust/elements/internal/generated/Synth.qll 7d528209a7949194d80a6754483b0d35c40495730b6dc5219fad7bbbcdc34b81 e6724d4a1d15e9e749ce95b256d009826540b1c507f26380d337e4df8d9265ad
+lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 9f3e357509a63659876f27d4f29f72686fcf43e5a64b4324d907dc28171cf236 9f3e357509a63659876f27d4f29f72686fcf43e5a64b4324d907dc28171cf236
+lib/codeql/rust/elements/internal/generated/TokenTree.qll 8e5a519b7e8df18a0002fe71fe75a5eff2a247c4bae216e8a3f5a2784745228c e7fd7226940c0a94bda7f6ebca0328cb3ce38323e9078c2cc28c5455188c3d56
+lib/codeql/rust/elements/internal/generated/Trait.qll 6c841ff68aa7e8b15041b8dd005dc282b4abad7cfd0ed6525bee103a1e84cd0f 9b45005dd7466e480e4a34bdf033bf94966d71e7654debdb64091f5713caae19
+lib/codeql/rust/elements/internal/generated/TraitAlias.qll 43d8186b6f68853c743286a1f0128b3f871adfadc014332aca7ad67b1e361d16 be292b7b49928bcf7a07ed92ea79a185f5add9a9dd018756d3372aba0f887f15
+lib/codeql/rust/elements/internal/generated/TryExpr.qll cc3572fffabba8502ca0f09d7051fe18e5e56c76eb1e22e563d3cef498a42417 53fcd5c57e4929ba985b10b33757bcf287e01792c062db57cdd3bc62bb00e7ce
+lib/codeql/rust/elements/internal/generated/TupleExpr.qll a291fa486d797230a78b7469a592315b172969ae1bd3b3f4895ac89ffe3e44b9 301eda50938f9170ee305dba2821dbbc2fe16e7ba1d0f3b26bddd959c7a347fa
+lib/codeql/rust/elements/internal/generated/TupleField.qll d574f15ff1d1d0918e8aead47709b6f9c947fafffb468c140b371b052bf3a35b 7a7cfacd851f7aba8a5e9d018c4c0b2c84f48a7ae633fc51fe2232e49eb65468
+lib/codeql/rust/elements/internal/generated/TupleFieldList.qll 25f2afad44f4bd86d44a781f9c37aae395c8fe10c1c6b0efa1c4ae3f13964975 13a6677f5c626818a0853878c7c338adfc74719f0aecc8da16584f9873cc533f
+lib/codeql/rust/elements/internal/generated/TuplePat.qll ef46756db8fd15dcfb99b417330c0564f04f02853784116fccf83445a1c112c0 0b6bd93921ba25f95111a83cb132125fa4be6b8e6b0b94a0117f575d64cecf5f
+lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 29d7310c1f309b78934d7b8640a802d1c0c2dce5d41ecaaa286be848e1b269f0 cd6de8c9105848127a822c3f01648411471be5dd12d7e5f2f76e5c81f43e919e
+lib/codeql/rust/elements/internal/generated/TupleType.qll d35c54b42eca5ec3e76d56c09854c257c1adf24d4a98ca5e4b24fa979d7e53d7 d68d510cd03764234293a05a567a2754538566114cf6e3e77e00585b2c0d5b10
+lib/codeql/rust/elements/internal/generated/Type.qll 859026cbd5510413208887adc61d0bbdfcdd208288d6985836a484642d36a1eb 3a8957c00d105e7290a6460374f2815bffb435baeeebaa6db8f42581f4527d76
+lib/codeql/rust/elements/internal/generated/TypeAlias.qll 091b8447d218693125e5f2c953400707d55b2dcf819c9db7781c0caed8b9e235 4a3cb4374c17552cf8d5b609ee6255868d1d3b5538bc067607705b3e46f85c1f
+lib/codeql/rust/elements/internal/generated/TypeArg.qll a1deaf41b7acf716bee5ad0fc0b2a5dd06e01e7ba575ba0d7e13f1f29d0c1f65 7c946287704002dbd5874ffd117cea4d2beaf8a6b15a1f9ad8f021093e3b1565
+lib/codeql/rust/elements/internal/generated/TypeBound.qll eb3984ad52abdfce0e32ab15d955d31d050ab39a79d2d51baa3a91586e135d0a 30b8e68ea6984322ae3f49b2a1d0383000954e60b3f9281ea472b968919b2ff0
+lib/codeql/rust/elements/internal/generated/TypeBoundList.qll 1ee71cd9281c47d2950bad0d30476f04251a053e1584d9ffc56630e83ad11834 23f04a00b7ee221a426badaad1959c7a04b46a502e434adb64d46f882cedd435
+lib/codeql/rust/elements/internal/generated/TypeParam.qll a1d12f061cc9187ff4f3d326a8a48f090f62c9528c17b5dcaaba08c2181ff4ab 22fb660950ba8434d84112dea57b51306d7b2654497ae6c65580ca91d441e4c8
+lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll f10d3935056b511547490d29ab549425c745fb4563ca5e2609e7f702132a3065 006ad35941df178c85da475fb1965af87e82466033fd524102f07edebb9602fb
 lib/codeql/rust/elements/internal/generated/Unextracted.qll 01563dfd769d6dc3c6b8a40d9a4dc0d99a3b6a0c6725c180d2bf4d7633929a17 a93ce90f8c03f4305e59de9c63f089fc7935298fc9a73d091d76933cf63e790c
-lib/codeql/rust/elements/internal/generated/Unimplemented.qll 465d7b113a1a8d692077690242ac2e2f276026473505412b813da6f96535706e 406f7f40cdd2086986a5e947655a0c3b114ff0c04fccf3a1fa1e2c14a94af9b0
-lib/codeql/rust/elements/internal/generated/UnimplementedDeclaration.qll 3b7820f5676b32a9c3761efc0158ef3d086692424934565b179abd330c649461 3ebf55e2d2238af56828fb918e7af6db7bdaeef16917f5c6da7b2affc8779824
-lib/codeql/rust/elements/internal/generated/UnsafeBlockExpr.qll 30593818fd5a71315414b0e0e36c7929dd2399f22254dba7a53d7f9709fa4c7e 3664b76e327521e215ee6c9d5cbabe047967549806dbf351a644f8d149f76679
-lib/codeql/rust/elements/internal/generated/WildcardPat.qll bb2e63f3a2ea6d5067d3ae4d4b2f65f76577d14568f7f7cc958af55a47b562ac 9c09f9e7a10c4d2b136bb713f44eebc08adf776e5909ba30555425592898fee3
-lib/codeql/rust/elements/internal/generated/YeetExpr.qll 6b4d94c45e29e50d62b6042f8a4b96c0e96de14de0bb0d20baafcc09b0a10108 df435ecdfd65888ccf6560adffb980d78cf7e5f42c041cee76d482a31c7654a5
-lib/codeql/rust/elements/internal/generated/YieldExpr.qll f2b730481f738a96beb2ac70d4b7e3b9d453883e413aa8062824e9877663e7f2 8b326d431c9f2c2042bebb1ab92b99976737323d6e9c54cc2fc734fe73e665e1
-lib/codeql/rust/elements.qll ff4b87ba3c6baf57a511d301bb9e16620f6adfe6477eab6040d825f0aa9457bb ff4b87ba3c6baf57a511d301bb9e16620f6adfe6477eab6040d825f0aa9457bb
-test/extractor-tests/generated/AsmExpr/AsmExpr.ql d0b9ab7eef8934807033f00a7a4752d5d1051d362840c248efda55d79b2b2092 8d6e7756b60f5dfa500c26ac232e0c44d2d7408aaadcb8d8db9af30a19546eae
-test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.ql 85d756e682ad4f0e2be46776e914f80f4d97356cd27681f6a6c95b59af96d784 071bac3717eb18d89d9e489c3339c339a405d22ad9c2214323649e383cd9b259
-test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql 905343965d7ea869acc5a651aa98c04bf13124feb02d7df27dcfde7444d89645 ea93464d067b393856a0d9c2a1b3a5562e9a330bb74f490e6a0a11b3563b3f6b
-test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.ql c7e97edbaab7fb5a1d94ba8054bfe25ad1cc03d3145c6e79e640a0435948841a 2c4ce3a66a3704a3ea976710ffe2f5d66cae374a00d251e7d1b020ff6eb75ec6
-test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql 6baa86e600b1e644c31b07a0339cb0121f0f408b378f4724913d9e915a60ef15 1a6a1e861fdd06f684ff59da4e18e22e4e031eb7d74ef926e73fdbbae4b0c534
-test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql a36a06c08b04daa6f6ff22867c175004794aebcfcbcb10c1fe074b2c5a2dee72 2c0beda0cdfa346d33768f9cdc690831c102919d96dc44c3c68b9cc254a9c0c4
-test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql f51bee6fe6c127b93f3389a55907dcc3612cf55699409fe2f6ca0c170c276a90 a19675ed98a883e2aa6607af308cab050826e7a1c35c2a4b1d321040200265ff
-test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql b1fd7293118b77c2d54cd0a235425cbfdc79ddabb522b062b3f888f2a14379a0 fe8ef99121912788d65dd57a6eef0a6a159afe90bfdf159b096478dfd0d5db5e
-test/extractor-tests/generated/BlockExpr/BlockExpr.ql 515422cb924e8f10f43c13850970a8cec5c9b1a5bd320825a8af0b6cf0fa213b 2665637c5ff2bbf601a2d156583bbd44b58bf295546ccf0fb67f069ff3ff74da
-test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.ql de3c28a2677ed71ebd95207aa43ce270765f7f556283f095f1f6296622b80cbc 414ebbb2bfbe4350f933fc3d3636b49a6bb8242e200180780caf95ab8523adb0
-test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql 69f4b01ce9d5556d7feb6253b5338381fb87bbdac9689259782d4137974f1157 0d881570e704c1e0b9c9c5b4ed651d7cddcd68b3e0924e33245dc058cb67f870
-test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.ql 741818e134e2bebcb85cda6ef51602630df107818ed9556542ac3cc24055e72d 62ffc7338d85dd08b35266c6c6f065f0b8738f48567905ebc7006702b81b4dae
-test/extractor-tests/generated/BoxExpr/BoxExpr.ql b978301a8c9efe3e6377c7e41c5b4750f172a61ebe2fd4c2bf1220de5a84a4d4 84903da0392078a0212c4eb18f8da29e1fbd33dc437cacd6545007f07649c66b
-test/extractor-tests/generated/BoxPat/BoxPat.ql 850ddde8ad94d0b96f042adea48be544dc87af810098aa3a18649f03349e1718 aa775f649d818a48b89c15c7c0de5346017d9e432c6b8089adac51d3144c3e17
-test/extractor-tests/generated/BreakExpr/BreakExpr.ql 498d6a8d397563b305e023868996e838600f6a8ef134aebf2a4bb16ff1b2a882 7bbd39b4122935ef24b891b3490f87745747d89fc92d96e24149e251dc40ef2b
-test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.ql 0358f4fe6a66da56177703cf0e991042729c5e34ae8b6dccbb827f95fe936c72 1cb2dd778c50e19fe04c5fdf3a08a502635ea8303e71ff38d03aa7dc53213986
-test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.ql d1ca3cdaf5345818310d2db0f2171ff5c3b51f72049d8e1593ba11e52273fdba a52927e447cadee30712adb139e248b0c303eaa111ec96a165c1e484129af8dd
-test/extractor-tests/generated/CallExpr/CallExpr.ql 9f4344f3e5c8d0fa4f4ae2852bd138bacd03aa3000915626c245d98a2bdf4d04 fc1a0e71feee06dd65fb7e587ece5720e79ade1e9f452fa752290aaa7c2f3ceb
-test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql 7d8d53ee4a0642f85d6bbfee6912fead699b5d117534d2b1803a670550894484 1782b33724b72afc9b7d99e3a52cacd4431ce1e12a7e43a7ac9872aad769b4ee
-test/extractor-tests/generated/CastExpr/CastExpr.ql 15a1031c620660c59bcb97f194f6a2f51b980aefdb39b421bfd488d6083f301a db35e9fc243a10dfff2e689547bd72baff8d0a59c0c9a505027caa577d33fe58
-test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 34280a37a6854c3663baf9612e49de4267a06cd70d4c6252b97405627fc1829d 5e9f565f4fcf48eb4317fb9a6e532361f58db93344e50bdd0ad51cb88b92379c
-test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.ql 828d3cb2e0c85a22691a7189f722eb9dc16e4a8e4df8aeebbfd47612ef60d774 74a7db9d3346fb364485e5b45f64b11eca58f080bedb9562a47c29587e0b9e00
-test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.ql 53f0ca394a11b9ba30cf3773f939c3d97071d22e417451a6cf4e4a81660e3f36 a6fd1043585b96c92875747186c0c211aca4228f82df6382804b2cad64458817
-test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql c95bc7306b2d77aa05a6501b6321e6f1e7a48b7ad422ba082635ab20014288ae fe72d44c9819b42fff49b9092a9fb2bfafde6d3b9e4967547fb5298822f30bc3
-test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql dfa92e1da623088e71f14e2298e07c30d2ec678236ec54d9654534ae195fc48a 72700785ab795ff6ccf702effbbd86a21c02d48ce2e206a90bca42c633167bc2
-test/extractor-tests/generated/ConstExpr/ConstExpr.ql e6699b72b1e61a0a4adb55e8fee7ee77f99d8ee4a4e0afc81072a71ce2160bd6 d30cbda271b51501b6c1764bc4e9e703e8bbfeac58bc9a4920d28b188da9aefd
-test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 79dac2a78474eb555579768726f5847f1c4dd8ddb62adbff577bd38fa2ec5a88 d8b3e9b6c1e5760f3d4d0a9768d96c73e6a10f415106212c6de4c2dd09e2fc0d
-test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.ql 8800ed6eb6639c8e2775d0ab73f489c5f050fba75768497bb3b811696de0fc33 26fabcec52eb83494ab7b49d4cb8da75d62240e2c90e60e2a339e09db5a17293
-test/extractor-tests/generated/ElementListExpr/ElementListExpr.ql 934e9f23cb987459baea1f9c2fb244ce6152891c5df91cd0bf55ac7aa1397993 05d0583509bed8122b47dd867e66df8c6bd8c3784b1d88c8efe2931f1605733a
-test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.ql 6570425a1722361d965d3dee82ac520efa6b136405f895232156c51872a2020f 5f9c7b26ab2fd2a95a4a7e86797112a054ea0fa12d6c9daeb7ee570b680c65d1
-test/extractor-tests/generated/ExprStmt/ExprStmt.ql bfa740ca27f40dfa03d3d6e1d04b6a33eefb11b51f1be8e8eeb97e2175ab48d1 5dc2f48475155433eed95ee40b055095096d972c410ca633807dcc7bd012b8ee
-test/extractor-tests/generated/FieldExpr/FieldExpr.ql 3645fdca1ed9f90c2074b4797763b99cf9159dc61305068b6316cd3278904b37 5956b62c22ae38f8434a2a6bce2dc07f1a4ad2801d5a6b6c54dc30a4c1003b8c
-test/extractor-tests/generated/Function/Function.ql 347912a8d8e541993f56753400867e04e96f3b20d4a7aa75ba8c967982f23f8c c81f0cea4bb896c5ef56e43c0b98c9f1082af6ae6ef5a3aeaa7f3bdd8cc47e74
-test/extractor-tests/generated/GenericArgList/GenericArgList.ql 5dbc447435af8fc2d57838af87360976a0a9c262cf98e79999798f1cb44c709d 16dad42ef8445d3c29d8bece7b68b4c04e123a1e4054ac0673a99c85267638bc
-test/extractor-tests/generated/IdentPat/IdentPat.ql 8337872488c291ea441ad33103c5834c31f1db018a1f466d5075bc7e2ade01e7 72e2598880e389f1fad9cad937b0c6d1305ebee8a7b1613e1b1f913b9cd88d9b
-test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql 7be7acda6ac92efa166e49788f5bce771e3962348c144664f0d3ad2142134d55 9ffb007e064f5aef13e436948b9683d0c424019d3fb36b812760f421b2670493
-test/extractor-tests/generated/IfExpr/IfExpr.ql 32c487d00371a9ba10d824677b3020f00a1f0e9377e1741b3d418f561552014e 6dc872bac32a54722d939c265da57fe405b78076f8022eebf36773858e0a6893
-test/extractor-tests/generated/IfExpr/IfExpr_getElse.ql 8674cedf42fb7be513fdf6b9c3988308453ae3baf8051649832e7767b366c12f e064e5f0b8e394b080a05a7bccd57277a229c1f985aa4df37daea26aeade4603
-test/extractor-tests/generated/IndexExpr/IndexExpr.ql 13af7f85807917befce33d64274668593071a1669e1870ea16d22e05eddfdcff e7afa32f38ed6333cf943baa2298ae7e6d2550cb6e6c55372c575bf82703c46f
-test/extractor-tests/generated/Label/Label.ql 4fe2d7bf9114539791559e22ca3a245f89eac09672cfefad68ff0cb35b0778bd f7e6c99cbed35bb4282666fc5ca4b898319da61b9b30fab54561404d90bcf1a7
-test/extractor-tests/generated/LetExpr/LetExpr.ql 36ac1c0729726716d91272cf57c21991bf5916531d7ccc0a281420a52fb3e896 298164f9b79831fb4e0b4d75a592c680756ecf9f96893d66fd62ae52ca8dbfd5
-test/extractor-tests/generated/LetStmt/LetStmt.ql 471d18f20b46f62648456b5e0441955cd98bdc53390edcbb11a112ee775c412d 601e791bf918f28d3a69afab24573ac3b5c4267856a8895a9a14a1b206b1f0b4
-test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql 30c4a33322c60222c0ca1c9df464cb2c9c6658abfb2628e285559a5a615d64b8 da9155a3343363223b9c45419ce389afcc9940f4fa77e50372ae4e382807948d
-test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql 6a5f0eed3ce3e8cbc57be6ec2b4eed732f00e084108d21a61d9ab28b65e494ca a48b426b97a6c347ad04fe2e592cd25b5c66b2a6a299cbf8c0da03e14304fd70
-test/extractor-tests/generated/LetStmt/LetStmt_getType.ql 9a85b5d1f3baa012ace9a80e6daed660413248ee63da6dc3c84b0c668b25c7f9 c0efd0d112c4dc02c85cf1b1114fe9d0f89916e551f2d2a7c9a3315b5db4d46d
-test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql 99450960211802b9616c11b264bb4fb9be8f1873b3b9278252f752a9de745aad abaca7c1690aeedd7a2a8452dc26108612a5cc0fee956ed6c54b780e02ff808a
-test/extractor-tests/generated/LiteralPat/LiteralPat.ql ec72777ee67c59a0136c0219c83341940d3f525609c85f42cf6779f2d16b1b67 1f0d6c3e93cf4c799839000fa1c35d07dad9b175503af38615c172a6fb0dec63
-test/extractor-tests/generated/LoopExpr/LoopExpr.ql db30c458ce8fef33044e9d1832464da05b86c3116c8601f698e7a0e1095b1450 a1032375dbbd1dabf5a41b23e8439db8e471933c3bda87d1671d5889aba252dc
-test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql 0b77b9d9fb5903d37bce5a2c0d6b276e6269da56fcb37b83cd931872fb88490f c7f09c526e59dcadec13ec9719980d68b8619d630caab2c26b8368b06c1f2cc0
-test/extractor-tests/generated/MatchArm/MatchArm.ql a8371ede979aff0aa5d26ecf188695381ac82602c04a7267e11bea7cdc35406b d5f8026e8305be5b6b617bed63f3389564ef15cc1e0f9595ee739b3874299464
-test/extractor-tests/generated/MatchArm/MatchArm_getGuard.ql 54e2c2805d54b353c9e36258ed750189846cd422dfb476c6eb52301860d7ff13 8fd408a3e9c6e5c138860144ba0f69dc2099a7a062e3bdf7d324c09df7d132f3
-test/extractor-tests/generated/MatchExpr/MatchExpr.ql 7d52f44e4951420c21a3bb4a6d6903cbe9d81295510bb2b9b7de43a2a0a1d700 3cc0996d4fd19b37bf97cbd9d062b442409a56e18c6c8ef06b933faaaaa899a8
-test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.ql 331b9e606d66d399aeff9a83915411fdbe0d28e4dd4e86ac39021859454ee9ca d0ad3b17bf8a30cfbea6cde96180a503e74762ffa8dd1918557d5ab3971e59f2
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 563ee88de245a890c32a83ee317bf56c6d66d5c2ed7e7aada726101926fb0090 7277be66ae233700e4e94c4467ee688692a883e3d42a0207be5edf9dda4ecb5d
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql 10a88c3bf63dfb26f43b9cd1ed7fceef0f436ce2eff4b5a816da369bf5b775d2 ee3b5043719591b4048ec32e21bb5fb3a9f83f0420ef18c338fc0ac28d0e3240
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.ql f2ac26ad6c5cffb8e3c1916e35c97b6247264a9d61960a808330ad21c7294335 4405ec19db4d155e0f1741a9c23292c4d31dc700a86a3bfe346340e9d01cd047
-test/extractor-tests/generated/MissingExpr/MissingExpr.ql 31fb99d3986397ec78f75deb6e712e3385e3ce60a6b413cb69523ad520512053 01f469a3669b3a50121108fe24de005fcad567ea71c9d5fb12e5168714fa5dae
-test/extractor-tests/generated/MissingPat/MissingPat.ql 9ef95f4498e399c28241f1b187ea358bff6c0778c92812188164311c6b238530 d953cf729ebce6c627568db4b8193cd175b98a8b599d8790ba027eb3239a3348
-test/extractor-tests/generated/Module/Module.ql c9a97238ccb97b391b62bced326236e27bf003e1c341a653e441b5901fa8460b 7b69b35a462ac7cb210203d3f5e888effd09c63313d172fc31f9754f2cb3534f
-test/extractor-tests/generated/Module/Module_getDeclaration.ql b63127ac4c3dbdcf2596ff6e419275464a0581039f0a9438d766bfa8f6b9eaa5 d329498e942961ff29453f2194f48c720f19ed566ad0a817f5e14bf894fe4dd2
-test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql fc3bcd5387d30c623750199ed836fa8132ec83d45e3ae1771ba7c2cb974683ca ff71a97721bb71f6c23f4db8c65311f0d3c9fab18911c28424ba1ca686c9cf24
-test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql 6d729fb91deacb1f620df5cbc86473183664e81849958624195da883c410a707 f3374c3d7306699d1f9d1c6c5788ee7c5a17103345bf53847be9d94e5fb9f14d
-test/extractor-tests/generated/OrPat/OrPat.ql 444363895150e7a4be27a08224b0619fb38ba48719e234cbc93a70f1185e6770 1f34008389f968c1e4bdc847abd6cb0c3ee0196a5b965d9119c70b82e0f140cd
-test/extractor-tests/generated/OrPat/OrPat_getArg.ql e9daaa6198d427bd00dab3f103766f734c29d15c4bde639018329c65ef85d1f2 983659d27722e3f4f8c03cefe6b0927fb42c0a72f626b42bbdada7ca27669a62
-test/extractor-tests/generated/Path/Path.ql 1a7bb385742036dbd7e7e85ac30d78f4c29ef8cf73c8d6d816b974ae3e57661d 90073e4f293c518eabc6638f86ccb5af7982633501a9b7f2746ba85d043fb962
-test/extractor-tests/generated/PathExpr/PathExpr.ql 3f575a6fc59b571e3d89a87777e5e76baca6d89435068929e0c163f2edd51d55 bf8d00401dd24b1a7d332f326a4d8c00bd770e97332741fbabb7e74cf3f76e5d
-test/extractor-tests/generated/PathPat/PathPat.ql 8cd3e49a8a9a58d28ce4247ccb4b29ff864c8e1539f725f7faa3ff0cd3db8893 59479b7f0c8eeadf6e3f29849e2b5acff20af920db80fe35def16b21126bd6d2
-test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql f4ceaca7f6e562b2572406538c946017696720ad6f848ef60207891cc990f6b7 8520b6fae2489f58d535e96f87a273388eac1e043f88e4a1dcdfde05b9aa4873
-test/extractor-tests/generated/RangeExpr/RangeExpr.ql d18b86af326b360d6b30e8ce60eab8c4acb6c65c9cd2e8b227c56200cce07c88 34a9bd2a93413ca8d6cd8501bd1134aeafed25d7a037165e7c471a28a61b47d6
-test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.ql 3ee67dbb7b5d727cc527853c011da2b750fff59300adcc21780decdf80ec1b90 f1b404ba59e43b911d0e55203861d067fa21e0ff80584e44c2a510b1c5d8e197
-test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.ql f9d5b081efcc2373e0b28854f863b1b9ce25eb8d02805c7ea82f0f98820d41e6 4ae93e7970f1396230fb063e05576bb26c4b5b7b10a96f53f95720df74d93ac2
-test/extractor-tests/generated/RangePat/RangePat.ql 6cea2c1cd4393d777a42c31ee54f4e78e62d63de6a18c343c44df45090fb75b9 33e424105bb67f73952a325d973095e53b4c1bdad6f785a861d0ea117f57ab24
-test/extractor-tests/generated/RangePat/RangePat_getEnd.ql 723eb5030ec52d3aa3650a3e2de6cc0195a0030630239b972235963320e0d808 2df3b1a6197c3abd43dc743fd09cbf55165e3191f2b49336777594541e5da96a
-test/extractor-tests/generated/RangePat/RangePat_getStart.ql ad2066efa32fced2dd107031f2a9b9635c3c892e874870a4320522bae9309aa4 b4a8c57a838074e186b823938d1a9372153c193da6c839b5f242ca25c679e83f
-test/extractor-tests/generated/RecordExpr/RecordExpr.ql 7216a4118bd2b1dcf279e7f0127baed162902a9cae1bdc8ec7f11a04f2a4d924 87812e6936a9b9f0217a6ac2add7063e5ce9b31da2c843f9931418a54235d615
-test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.ql 1c9eb98bb37b7d454a5ffea8cb7e5b73a6e3b30f8a99aa52dcca957111187b68 4b8f92d215653cb7186fc00a51156affd2a25959b1b5e8111d47772d83a6a222
-test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql 2eb8f7591f08199d124732d7f2d7dd3e81792a52f8e6c90003aa0609923f8cb0 27e245224d6c9aa20023b418ce8dffff1293b50a0e10938932631fca7c559e78
-test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.ql b2953ee3b508fdb5e5eade3e9b1ee9e55cfa966177d3710aad97b75f18ca97be 24842e2b44bbe48f721a2816783ce98640b128809dc9dba0d7e75cee493bbc38
-test/extractor-tests/generated/RecordExprField/RecordExprField.ql 50985b2ed4d1812c75e496fed7a72687d33b3256f2be20251bff932077d5fd45 787658ebe9536a6ab5b68b21386ddec26aa90c11d60cb89628f28efa3984f460
-test/extractor-tests/generated/RecordPat/RecordPat.ql 6112996f6cbbbde14690d74e838e26a95ae5e8869e41fcdfcb2becae0aba9ef4 51208594df12c47ae766429394ddf0fd6c3463176fbfe6a8c783a563c9737156
-test/extractor-tests/generated/RecordPat/RecordPat_getFld.ql 42a4aef52fde77fc5ffad105609d40478eabf62bdc35f35db38a3fb43e56aa9d 3e911c01c5b62a07ed36b41b66fa7bf409cfccddea5e051ab34c6c8d316226df
-test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql 187b8d44de158fc809257e28b2e8fdd246c8eb3c60115d54cd53396a320e372d 74813fd13c6f34927420ed44620743f7c80c537984e0db72c1c5f4b754b40b83
-test/extractor-tests/generated/RecordPatField/RecordPatField.ql 54cd63c1a5fb16d19d62bd805074f09b8eba9df15cce9e9d9c1637afbb7884a5 7b904d7ab1662233eb5587b62b197d90324d7dbd9fa63b28679ef19858af68f1
-test/extractor-tests/generated/RefExpr/RefExpr.ql f3a85ab3e534f795fb7f08c5e535cb72132b532d5ce0b448803b8daa94e59679 c4b4cfa003727f34c772164f3c8a9258b19337d0645d497d6fcec4eda9fc6a28
-test/extractor-tests/generated/RefPat/RefPat.ql 22353b55c0559f9b25f5b9610b22d7df3ba5a76ab3f5e46eefffa3f5c0f52fa6 82759e0f701109ecbb8e17288a5b636171e956bd3efee6ebb4553b74e73cdc03
-test/extractor-tests/generated/RepeatExpr/RepeatExpr.ql 4cc25fdbe5650e54ea886594b57c4fd0a47a9d3d65ecf61f3ba8e630dcd37ab9 accb72305335f60711f7064738a6c141f81df088c34b486d4dc86bcfcbdac5b1
-test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql d0fd5b7af74ca6b059116607c11c5f3a5c522d31e9ad18dd2624ca30177e1425 897ccfe546c6dbc37212f4c1a26427ee59e29dc51ad764862ad719a10ad3ba2a
-test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql 7d4562efb0d26d92d11f03a0ef80338eb7d5a0c073f1f09cbb8a826f0cef33de 523ebd51b97f957afaf497e5a4d27929eed18e1d276054e3d5a7c5cfe7285c6e
-test/extractor-tests/generated/SlicePat/SlicePat.ql 339a471e5519922555750dee1b052ea9a8d7c562f2c311d41e06ccc73df4fca1 60a430d57c07b443e0806be5b92a412767e74e7cae4c0f6d23f4cafc4003c4d3
-test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.ql 0e0529209201838fc646b04155e71528348d478c3577bdde0afd9c23a29730e9 3597fbdba12eaa9cc4c2deafa07e558295f039b9b86c330bc23d2eef39351619
-test/extractor-tests/generated/SlicePat/SlicePat_getSlice.ql d4e2c34ff26f753da099370b91c83e0979536de7fe09e7a657324583935f786b 4e36f7e3d245b250de2861c9b868dd313c683caec7609c5d1a2f20bb974cec21
-test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.ql 634db269d392a76c8a43cfd5cfaeb21c32fd049eb080201a78d10d5ec3beee87 a433e6e5664fc90bf40cbca5556f43e5b407d8c4303d55dd08816a722369dce4
-test/extractor-tests/generated/TupleExpr/TupleExpr.ql 0ac4829646d2fcd89636081f193ac0f88094c221a210766ceee7ad37342b67da 737bd100dc08d4ad9204bcd1c1bf19b18953f55d1c9c2e7b9937bca4364d6868
-test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.ql 3ee9e0172dff2fce6fa6cc9454040c03eeb85fd1336dbf5c3bd9267a9c962d43 71b8ee7fac1a421abefbd86cc811d2a75258f36698ca4ca0f933eb69a57f8d0b
-test/extractor-tests/generated/TuplePat/TuplePat.ql 8dd48a4a9b7ae94847cfbf5b804841784cb56372b2b66cb1da8c3d51d9b78188 7f9d96e11337525d1e074f84875311ec80c0b073ecd953550f72a95ec389132d
-test/extractor-tests/generated/TuplePat/TuplePat_getArg.ql 12ba9cab50c872d51329a6ed3904475fb6b6c990a4df7494c8906d1ce04d1d1a 41adebc7c9df727f60e5b83eeca8e688bbecc59e30997d9c4ad81a2627752ef5
-test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.ql f8527322afe932311e30cdfd43ba5b3380ef43deb4e45141562961c6657883e0 5259bbb35a4ff7076ec5af20e21bf12d938cdc65335a825b4e2a83c542d1af7d
-test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql 92829fb32660bea587a6bbdce63633040f6d5e4674c327af416bc211a5f2b08e 52ce0a1b9ae901dbdd286af2815fad27b0ed48842a358ec45474fa110ababdc5
-test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.ql 890194aa8cfffecfff9f3de0b8e061e753b3d036668c2fa22023ab5e8f4d524a efd268815ecb12f4d285bf4b172d419933c8773574905e028750c46898530ae8
-test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.ql e88875f8c508b60fcbe6b4dfb61239b506f9bd3a57233087bfec7a783697d7d9 a2024c4499afebfc86b3c7fa144fd9c33ab4059bdb0dc7e68f6951b12eafd079
-test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql 13a06696bbf1fa8d5b73107e28cdba40e93da04b27f9c54381b78a52368d2ad1 5558c35ea9bb371ad90a5b374d7530dd1936f83e6ba656ebfbfd5bd63598e088
-test/extractor-tests/generated/TypeRef/TypeRef.ql 2bf65910d4cb9327d512cbb6643b48283b9f227ee1c7729c260b98b77cafa30d f5a55e600a82525aaaf0e3418926b12d62e5821a980ca2c79eba0b70ddf0cc13
-test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql bf700e9d002d8427b0f4ad6c26cf7d58c77b586bc730ee133a56b17b6c946b37 f9bcafd16a86580877f95417c97458673bd7491de3f2cfc58463ad353455b504
-test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql 6d6d636931caead6a142df8cfd3e7a642dce53c419e0adbe376fc78d7552d120 ce9c9254e64724f73d44b18aa659aeaa04227555d7368862e1094c11013e191a
-test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql 531d7a546eadd004230a7e565a5067acbb200e7dc9a6971499bc7f6957bc93d0 24077d716bc4d64a227749bb4285c7102373d727639f091ca8f1839a0b184167
-test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.ql a2b247a370ae019a8ca38b5cfaa6b92e3c0fb6fb819fa5b34e2adb474a76ec5f 3278a70e1887123e282f26b43a5f6ebc94d3727f09eca999f46642f7d8541a88
-test/extractor-tests/generated/WildcardPat/WildcardPat.ql c6da9df739528763f423eac0fa537bfd524d3ea67794abdbc7f7c56193163273 42be2c5e296ad3afd05b5dcc208a4d2db2fda9323cda2df66054f921e37f6efe
-test/extractor-tests/generated/YeetExpr/YeetExpr.ql daa085839cc878f9c32d395543d03c0b41a27dbfe981925f59af2c40dd21f136 fe59397f3c5ac7d12404bf2315ba72961950c9295ba7ee148fa179e6b9e0ddcb
-test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.ql d77b68b621e5b903231e2dfbc53a1e1421d59a0ad2e8c346c2abc1a2dfc11efd 642eb5791eb336ff05594d06eca08735e54bdac3aecf5d31a4de1267d10cf440
-test/extractor-tests/generated/YieldExpr/YieldExpr.ql 144cd04488bc5d66f27f1ea8f067df1a8a31ac84688e818a77377c00c735d861 c4ea389244506bf73a0f285f15fd9844ee16640263e51cfe97d8aa87760cf835
-test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.ql 592f8938120a036d78d180eb59634341d72d5e76854d9df48ab1b9b69db99c35 efe2955a5b4acc24257f9d79a007d39951736ce8ca11970864d1e366c4e516e6
+lib/codeql/rust/elements/internal/generated/Unimplemented.qll a3eb304781991bff1227de1e4422b68bf91e7b344e4f6c9e874b324e82a35e60 6bc4839fda3850a56dc993b79ef9ba921008395c8432b184e14438fba4566f21
+lib/codeql/rust/elements/internal/generated/Union.qll e849c1e87d1fde45da50e33b055d387d2f1dcc9766a797f14fba69dd1eae97fa 9940e8baf9586cb959c7745cc475b53d417df78ca1b1599edad8d1982a75e706
+lib/codeql/rust/elements/internal/generated/Use.qll a81a9ece488471e6e396230e3230a213ecae7fce5ab00b5a80c72a2ababa60ae 71912ad9fc8c466c6c8107c7a3b7946247ec0985667a007f2665bb14f3ec9f0d
+lib/codeql/rust/elements/internal/generated/UseTree.qll 746d649bbb6ac4c91b6b9d6ad335abcc5dcc2cae04ac078684e2b210e3c3eab7 4ef4e9f969ff4455663bf5e8bddb824445ff42e8e985754e02298c9bed5dc449
+lib/codeql/rust/elements/internal/generated/UseTreeList.qll d92013afb8a46487cff767db232e4c9ab38cb393648ad4b30c4289c4ab376888 e9a8b6767a2aed13342fa84554172a43169030d7f16bce931a6100d6f6fed00f
+lib/codeql/rust/elements/internal/generated/Variant.qll e359f67471c2bcf7180a75f400dbbc41c8575b997097a2601e739d3839765127 b577d62195bd230b80b0391632d89fcf7d88a9412d68a87bbd611fce4c628549
+lib/codeql/rust/elements/internal/generated/VariantList.qll ba1adef71852c362db34e88f19bc8892f552c02df4d9b8eff98fe0ad3db26e9f 3487bcd89cacd9a509b5467c220667632f2649daaa5dc76a342110c6b35296b4
+lib/codeql/rust/elements/internal/generated/Visibility.qll 25d4070c2018a00f917030f578316837e315122b7250e313d8c3d3a8e3b2a58e 94ae9e50d0d7fe60c97902f14cbe99b073e1a4863a218f3cea3e683a73a3898e
+lib/codeql/rust/elements/internal/generated/WhereClause.qll 9373648f2097cfa1b008aff6264fbdf7a2ffd23d5fc4a48eac9e555ac5ca8b8b 81275c7b63f9327ddde9cd0c838c7524b107d467ffaf3ed2bcf93ae39cb3b158
+lib/codeql/rust/elements/internal/generated/WherePred.qll 83b6b5f7c5bf82903e80c25b1ecd706a0d52535229ee5db8f77b8ebdc85d62c0 e06274fc41f2a53e17f617372c6fc986a86c7a04db5dbc0450a04cca37256663
+lib/codeql/rust/elements/internal/generated/WhileExpr.qll 94c22d2bcf1e33023466cced2aad307d11e529f4167d8a1358a77423b5e4283a 06a18e476bc44b68316bfa15a45e68198e6116827a58f932e07275d7ebfa33b3
+lib/codeql/rust/elements/internal/generated/WildcardPat.qll 4ad8b12ee5aeb5d292f8d2e4fc1313a95d97be3a97925a6bcf91458a5a0ec968 9e8d55e228b9db6e5d16a207a3101a7ce92ecd0b68fd7b5de6ab9c1b5a03d79d
+lib/codeql/rust/elements/internal/generated/YeetExpr.qll 056a028398c4e6dc1e90c81419a6cefb5f1cb52e85cb21f891b1527de3ca734b 6137ea3f96dd80a1bc592f98f51c3369814784146d719c285895a027b8bd6dbe
+lib/codeql/rust/elements/internal/generated/YieldExpr.qll ef3de99ea1c0e0a5830651964d8f9dbaa5839a368f36eb44cddf72211b1442e4 a80f27d6b5548258b03c32823583a015672046d26cd6f81e1303b9e4871ffac6
+lib/codeql/rust/elements.qll 5001e78786d7f381c5212a0d0059bac5f7b2b601c6b9b493edc99cbc9503bcb6 5001e78786d7f381c5212a0d0059bac5f7b2b601c6b9b493edc99cbc9503bcb6
+test/extractor-tests/generated/Abi/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ArgList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ArrayExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ArrayType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/AsmExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/AssocItemList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/AssocTypeArg/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Attr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/AwaitExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/BecomeExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/BinaryExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/BlockExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/BoxPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/BreakExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/CallExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/CastExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ClosureBinder/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ClosureExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Const/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ConstArg/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ConstBlockPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ConstParam/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ContinueExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/DynTraitType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Enum/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ExprStmt/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ExternBlock/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ExternCrate/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ExternItemList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/FieldExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Fn/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/FnPtrType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ForExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ForType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/FormatArgsArg/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/FormatArgsExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/GenericArgList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/GenericParamList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/IdentPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/IfExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Impl/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ImplTraitType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/IndexExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/InferType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ItemList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Label/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/LetElse/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/LetExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/LetStmt/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Lifetime/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/LifetimeArg/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/LifetimeParam/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Literal/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/LiteralPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/LoopExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MacroCall/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MacroDef/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MacroExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MacroPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MacroRules/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MacroType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MatchArm/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MatchArmList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MatchExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MatchGuard/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Meta/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/MethodCallExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Module/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Name/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/NameRef/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/NeverType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/OffsetOfExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/OrPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Param/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ParamList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ParenExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ParenPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ParenType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Path/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/PathExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/PathPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/PathSegment/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/PathType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/PrefixExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/PtrType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RangeExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RangePat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RecordExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RecordExprField/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RecordExprFieldList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RecordField/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RecordFieldList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RecordPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RecordPatField/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RecordPatFieldList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RefExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RefPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RefType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Rename/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RestPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/RetType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ReturnExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/ReturnTypeSyntax/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/SelfParam/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/SlicePat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/SliceType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/SourceFile/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Static/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/StmtList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Struct/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TokenTree/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Trait/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TraitAlias/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TryExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TupleExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TupleField/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TupleFieldList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TuplePat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TupleStructPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TupleType/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TypeAlias/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TypeArg/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TypeBound/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TypeBoundList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/TypeParam/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/UnderscoreExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Union/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Use/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/UseTree/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/UseTreeList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Variant/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/VariantList/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/Visibility/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/WhereClause/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/WherePred/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/WhileExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/WildcardPat/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/YeetExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
+test/extractor-tests/generated/YieldExpr/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index f4b54272a6815..594fa7c940008 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -1,97 +1,190 @@
 /.generated.list linguist-generated
 /.gitattributes linguist-generated
+/lib/codeql/rust/elements/Abi.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/ArrayType.qll linguist-generated
 /lib/codeql/rust/elements/AsmExpr.qll linguist-generated
+/lib/codeql/rust/elements/AssocItem.qll linguist-generated
+/lib/codeql/rust/elements/AssocItemList.qll linguist-generated
+/lib/codeql/rust/elements/AssocTypeArg.qll linguist-generated
 /lib/codeql/rust/elements/AstNode.qll linguist-generated
-/lib/codeql/rust/elements/AsyncBlockExpr.qll linguist-generated
+/lib/codeql/rust/elements/Attr.qll linguist-generated
 /lib/codeql/rust/elements/AwaitExpr.qll linguist-generated
 /lib/codeql/rust/elements/BecomeExpr.qll linguist-generated
 /lib/codeql/rust/elements/BinaryExpr.qll linguist-generated
 /lib/codeql/rust/elements/BlockExpr.qll linguist-generated
-/lib/codeql/rust/elements/BlockExprBase.qll linguist-generated
-/lib/codeql/rust/elements/BoxExpr.qll linguist-generated
 /lib/codeql/rust/elements/BoxPat.qll linguist-generated
 /lib/codeql/rust/elements/BreakExpr.qll linguist-generated
 /lib/codeql/rust/elements/CallExpr.qll linguist-generated
 /lib/codeql/rust/elements/CastExpr.qll linguist-generated
+/lib/codeql/rust/elements/ClosureBinder.qll linguist-generated
 /lib/codeql/rust/elements/ClosureExpr.qll linguist-generated
+/lib/codeql/rust/elements/Const.qll linguist-generated
+/lib/codeql/rust/elements/ConstArg.qll linguist-generated
 /lib/codeql/rust/elements/ConstBlockPat.qll linguist-generated
-/lib/codeql/rust/elements/ConstExpr.qll linguist-generated
+/lib/codeql/rust/elements/ConstParam.qll linguist-generated
 /lib/codeql/rust/elements/ContinueExpr.qll linguist-generated
-/lib/codeql/rust/elements/Declaration.qll linguist-generated
+/lib/codeql/rust/elements/DynTraitType.qll linguist-generated
 /lib/codeql/rust/elements/Element.qll linguist-generated
-/lib/codeql/rust/elements/ElementListExpr.qll linguist-generated
+/lib/codeql/rust/elements/Enum.qll linguist-generated
 /lib/codeql/rust/elements/Expr.qll linguist-generated
 /lib/codeql/rust/elements/ExprStmt.qll linguist-generated
+/lib/codeql/rust/elements/ExternBlock.qll linguist-generated
+/lib/codeql/rust/elements/ExternCrate.qll linguist-generated
+/lib/codeql/rust/elements/ExternItem.qll linguist-generated
+/lib/codeql/rust/elements/ExternItemList.qll linguist-generated
 /lib/codeql/rust/elements/FieldExpr.qll linguist-generated
-/lib/codeql/rust/elements/Function.qll linguist-generated
+/lib/codeql/rust/elements/FieldList.qll linguist-generated
+/lib/codeql/rust/elements/Fn.qll linguist-generated
+/lib/codeql/rust/elements/FnPtrType.qll linguist-generated
+/lib/codeql/rust/elements/ForExpr.qll linguist-generated
+/lib/codeql/rust/elements/ForType.qll linguist-generated
+/lib/codeql/rust/elements/FormatArgsArg.qll linguist-generated
+/lib/codeql/rust/elements/FormatArgsExpr.qll linguist-generated
+/lib/codeql/rust/elements/GenericArg.qll linguist-generated
 /lib/codeql/rust/elements/GenericArgList.qll linguist-generated
+/lib/codeql/rust/elements/GenericParam.qll linguist-generated
+/lib/codeql/rust/elements/GenericParamList.qll linguist-generated
 /lib/codeql/rust/elements/IdentPat.qll linguist-generated
 /lib/codeql/rust/elements/IfExpr.qll linguist-generated
+/lib/codeql/rust/elements/Impl.qll linguist-generated
+/lib/codeql/rust/elements/ImplTraitType.qll linguist-generated
 /lib/codeql/rust/elements/IndexExpr.qll linguist-generated
-/lib/codeql/rust/elements/ItemStmt.qll linguist-generated
+/lib/codeql/rust/elements/InferType.qll linguist-generated
+/lib/codeql/rust/elements/Item.qll linguist-generated
+/lib/codeql/rust/elements/ItemList.qll linguist-generated
 /lib/codeql/rust/elements/Label.qll linguist-generated
+/lib/codeql/rust/elements/LetElse.qll linguist-generated
 /lib/codeql/rust/elements/LetExpr.qll linguist-generated
 /lib/codeql/rust/elements/LetStmt.qll linguist-generated
-/lib/codeql/rust/elements/LiteralExpr.qll linguist-generated
+/lib/codeql/rust/elements/Lifetime.qll linguist-generated
+/lib/codeql/rust/elements/LifetimeArg.qll linguist-generated
+/lib/codeql/rust/elements/LifetimeParam.qll linguist-generated
+/lib/codeql/rust/elements/Literal.qll linguist-generated
 /lib/codeql/rust/elements/LiteralPat.qll linguist-generated
 /lib/codeql/rust/elements/Locatable.qll linguist-generated
 /lib/codeql/rust/elements/LoopExpr.qll linguist-generated
+/lib/codeql/rust/elements/MacroCall.qll linguist-generated
+/lib/codeql/rust/elements/MacroDef.qll linguist-generated
+/lib/codeql/rust/elements/MacroExpr.qll linguist-generated
+/lib/codeql/rust/elements/MacroItems.qll linguist-generated
+/lib/codeql/rust/elements/MacroPat.qll linguist-generated
+/lib/codeql/rust/elements/MacroRules.qll linguist-generated
+/lib/codeql/rust/elements/MacroStmts.qll linguist-generated
+/lib/codeql/rust/elements/MacroType.qll linguist-generated
 /lib/codeql/rust/elements/MatchArm.qll linguist-generated
+/lib/codeql/rust/elements/MatchArmList.qll linguist-generated
 /lib/codeql/rust/elements/MatchExpr.qll linguist-generated
+/lib/codeql/rust/elements/MatchGuard.qll linguist-generated
+/lib/codeql/rust/elements/Meta.qll linguist-generated
 /lib/codeql/rust/elements/MethodCallExpr.qll linguist-generated
 /lib/codeql/rust/elements/Missing.qll linguist-generated
-/lib/codeql/rust/elements/MissingExpr.qll linguist-generated
-/lib/codeql/rust/elements/MissingPat.qll linguist-generated
 /lib/codeql/rust/elements/Module.qll linguist-generated
+/lib/codeql/rust/elements/Name.qll linguist-generated
+/lib/codeql/rust/elements/NameRef.qll linguist-generated
+/lib/codeql/rust/elements/NeverType.qll linguist-generated
 /lib/codeql/rust/elements/OffsetOfExpr.qll linguist-generated
 /lib/codeql/rust/elements/OrPat.qll linguist-generated
+/lib/codeql/rust/elements/Param.qll linguist-generated
+/lib/codeql/rust/elements/ParamList.qll linguist-generated
+/lib/codeql/rust/elements/ParenExpr.qll linguist-generated
+/lib/codeql/rust/elements/ParenPat.qll linguist-generated
+/lib/codeql/rust/elements/ParenType.qll linguist-generated
 /lib/codeql/rust/elements/Pat.qll linguist-generated
 /lib/codeql/rust/elements/Path.qll linguist-generated
 /lib/codeql/rust/elements/PathExpr.qll linguist-generated
 /lib/codeql/rust/elements/PathPat.qll linguist-generated
+/lib/codeql/rust/elements/PathSegment.qll linguist-generated
+/lib/codeql/rust/elements/PathType.qll linguist-generated
 /lib/codeql/rust/elements/PrefixExpr.qll linguist-generated
+/lib/codeql/rust/elements/PtrType.qll linguist-generated
 /lib/codeql/rust/elements/RangeExpr.qll linguist-generated
 /lib/codeql/rust/elements/RangePat.qll linguist-generated
 /lib/codeql/rust/elements/RecordExpr.qll linguist-generated
 /lib/codeql/rust/elements/RecordExprField.qll linguist-generated
+/lib/codeql/rust/elements/RecordExprFieldList.qll linguist-generated
+/lib/codeql/rust/elements/RecordField.qll linguist-generated
+/lib/codeql/rust/elements/RecordFieldList.qll linguist-generated
 /lib/codeql/rust/elements/RecordPat.qll linguist-generated
 /lib/codeql/rust/elements/RecordPatField.qll linguist-generated
+/lib/codeql/rust/elements/RecordPatFieldList.qll linguist-generated
 /lib/codeql/rust/elements/RefExpr.qll linguist-generated
 /lib/codeql/rust/elements/RefPat.qll linguist-generated
-/lib/codeql/rust/elements/RepeatExpr.qll linguist-generated
+/lib/codeql/rust/elements/RefType.qll linguist-generated
+/lib/codeql/rust/elements/Rename.qll linguist-generated
+/lib/codeql/rust/elements/RestPat.qll linguist-generated
+/lib/codeql/rust/elements/RetType.qll linguist-generated
 /lib/codeql/rust/elements/ReturnExpr.qll linguist-generated
+/lib/codeql/rust/elements/ReturnTypeSyntax.qll linguist-generated
+/lib/codeql/rust/elements/SelfParam.qll linguist-generated
 /lib/codeql/rust/elements/SlicePat.qll linguist-generated
+/lib/codeql/rust/elements/SliceType.qll linguist-generated
+/lib/codeql/rust/elements/SourceFile.qll linguist-generated
+/lib/codeql/rust/elements/Static.qll linguist-generated
 /lib/codeql/rust/elements/Stmt.qll linguist-generated
+/lib/codeql/rust/elements/StmtList.qll linguist-generated
+/lib/codeql/rust/elements/Struct.qll linguist-generated
+/lib/codeql/rust/elements/TokenTree.qll linguist-generated
+/lib/codeql/rust/elements/Trait.qll linguist-generated
+/lib/codeql/rust/elements/TraitAlias.qll linguist-generated
+/lib/codeql/rust/elements/TryExpr.qll linguist-generated
 /lib/codeql/rust/elements/TupleExpr.qll linguist-generated
+/lib/codeql/rust/elements/TupleField.qll linguist-generated
+/lib/codeql/rust/elements/TupleFieldList.qll linguist-generated
 /lib/codeql/rust/elements/TuplePat.qll linguist-generated
 /lib/codeql/rust/elements/TupleStructPat.qll linguist-generated
-/lib/codeql/rust/elements/TypeRef.qll linguist-generated
+/lib/codeql/rust/elements/TupleType.qll linguist-generated
+/lib/codeql/rust/elements/Type.qll linguist-generated
+/lib/codeql/rust/elements/TypeAlias.qll linguist-generated
+/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/TypeParam.qll linguist-generated
 /lib/codeql/rust/elements/UnderscoreExpr.qll linguist-generated
 /lib/codeql/rust/elements/Unextracted.qll linguist-generated
 /lib/codeql/rust/elements/Unimplemented.qll linguist-generated
-/lib/codeql/rust/elements/UnimplementedDeclaration.qll linguist-generated
-/lib/codeql/rust/elements/UnsafeBlockExpr.qll linguist-generated
+/lib/codeql/rust/elements/Union.qll linguist-generated
+/lib/codeql/rust/elements/Use.qll linguist-generated
+/lib/codeql/rust/elements/UseTree.qll linguist-generated
+/lib/codeql/rust/elements/UseTreeList.qll linguist-generated
+/lib/codeql/rust/elements/Variant.qll linguist-generated
+/lib/codeql/rust/elements/VariantList.qll linguist-generated
+/lib/codeql/rust/elements/Visibility.qll linguist-generated
+/lib/codeql/rust/elements/WhereClause.qll linguist-generated
+/lib/codeql/rust/elements/WherePred.qll linguist-generated
+/lib/codeql/rust/elements/WhileExpr.qll linguist-generated
 /lib/codeql/rust/elements/WildcardPat.qll linguist-generated
 /lib/codeql/rust/elements/YeetExpr.qll linguist-generated
 /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/ArrayExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArrayExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/AsmExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/AsmExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/AssocItemImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/AssocItemListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/AssocItemListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/AssocTypeArgConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/AssocTypeArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/AstNodeImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/AsyncBlockExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/AsyncBlockExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/AttrConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/AttrImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/AwaitExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/AwaitExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BecomeExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BecomeExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BinaryExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BinaryExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/BlockExprBaseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BlockExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BlockExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/BoxExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/BoxExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BoxPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BoxPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BreakExprConstructor.qll linguist-generated
@@ -100,62 +193,142 @@
 /lib/codeql/rust/elements/internal/CallExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CastExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CastExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstArgConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstBlockPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstBlockPatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ConstExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ConstExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstParamConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ConstParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ContinueExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ContinueExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/DeclarationImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ElementListExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ElementListExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/EnumConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/EnumImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprStmtConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprStmtImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternBlockConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternBlockImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternCrateConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternCrateImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternItemImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternItemListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExternItemListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FieldExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FieldExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/FunctionConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/FieldListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/FnConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/FnImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/GenericArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/GenericParamImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/GenericParamListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/GenericParamListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IdentPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/IdentPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/IfExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IndexExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/IndexExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ItemStmtConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ItemStmtImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/InferTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/InferTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ItemImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ItemListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ItemListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LabelConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LabelImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/LetElseConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/LetElseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetStmtConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetStmtImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/LiteralExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/LiteralExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeArgImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/LifetimeParamImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/LiteralConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/LiteralImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LiteralPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LiteralPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LoopExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LoopExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroCallConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroCallImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroDefConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroDefImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroItemsImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroRulesConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroRulesImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MatchArmListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MatchArmListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MatchGuardConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MatchGuardImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MetaConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MetaImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MethodCallExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MethodCallExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/MissingExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MissingExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MissingConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MissingImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/MissingPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MissingPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ModuleConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ModuleImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/NameConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/NameImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/NameRefConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/NameRefImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/NeverTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/OrPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/OrPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParamConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParamImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParamListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParamListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathExprConstructor.qll linguist-generated
@@ -163,8 +336,14 @@
 /lib/codeql/rust/elements/internal/PathImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathSegmentConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathSegmentImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PrefixExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PrefixExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PtrTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangeExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangeExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangePatConstructor.qll linguist-generated
@@ -172,233 +351,414 @@
 /lib/codeql/rust/elements/internal/RecordExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordExprFieldConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordFieldConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordFieldImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordFieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordPatFieldConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefPatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/RepeatExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RepeatExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RefTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RefTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RenameConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RenameImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RestPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RestPatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RetTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RetTypeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ReturnExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ReturnExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/SelfParamConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/SelfParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/SlicePatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/SlicePatImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/SliceTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/SourceFileConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/SourceFileImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/StaticConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StaticImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/StmtImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/StmtListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StmtListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/StructImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TokenTreeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TokenTreeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TraitAliasImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TraitConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TraitImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TryExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TryExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleFieldConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleFieldImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleFieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TuplePatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TuplePatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleStructPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleStructPatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/TypeRefConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/TypeRefImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeAliasConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeAliasImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeArgConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeArgImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeBoundConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeBoundImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeParamConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnextractedImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/UnimplementedDeclarationConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/UnimplementedDeclarationImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/UnimplementedConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnimplementedImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/UnsafeBlockExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/UnsafeBlockExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/UnionConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/UnionImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseTreeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseTreeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseTreeListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/UseTreeListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/VariantConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/VariantImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/VariantListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/VariantListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/VisibilityConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/VisibilityImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/WhereClauseConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/WhereClauseImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/WherePredConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/WherePredImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/WhileExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/WhileExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/WildcardPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/WildcardPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/YeetExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/YeetExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/YieldExprConstructor.qll linguist-generated
 /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/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/ArrayType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AsmExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/AssocItem.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/AssocItemList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AstNode.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/AsyncBlockExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Attr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AwaitExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/BecomeExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/BinaryExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/BlockExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/BlockExprBase.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/BoxExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/BoxPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/BreakExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/CallExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/CastExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ClosureExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Const.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ConstArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ConstExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ConstParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ContinueExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/Declaration.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/DynTraitType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Element.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ElementListExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Enum.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Expr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ExprStmt.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ExternBlock.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ExternCrate.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ExternItem.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ExternItemList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FieldExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/Function.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FieldList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Fn.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FnPtrType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ForExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ForType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/GenericArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/GenericArgList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/GenericParam.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/GenericParamList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IdentPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IfExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Impl.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IndexExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ItemStmt.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/InferType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Item.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ItemList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Label.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/LetElse.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LetExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LetStmt.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Lifetime.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Literal.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LiteralPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Locatable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LoopExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroCall.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroDef.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroItems.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroRules.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroStmts.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchArm.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MatchArmList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MatchGuard.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Meta.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Missing.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/MissingExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/MissingPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Module.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Name.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/NameRef.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/NeverType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/OrPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Param.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ParamList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ParenExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ParenPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ParenType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParentChild.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Pat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Path.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PathSegment.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PathType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PrefixExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PtrType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RangeExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RangePat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Raw.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RecordExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RecordExprField.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RecordField.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RecordPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RecordPatField.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RefExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RefPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RepeatExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RefType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Rename.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RestPat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RetType.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ReturnExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/SelfParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/SlicePat.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/SliceType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/SourceFile.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Static.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Stmt.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/StmtList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Struct.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Synth.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/SynthConstructors.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TokenTree.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Trait.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TraitAlias.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TryExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TupleExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TupleField.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TuplePat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TupleStructPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/TypeRef.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TupleType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Type.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TypeAlias.qll linguist-generated
+/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/TypeParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Unextracted.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Unimplemented.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/UnimplementedDeclaration.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/UnsafeBlockExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Union.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Use.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/UseTree.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/UseTreeList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Variant.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/VariantList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Visibility.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/WhereClause.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/WherePred.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/WhileExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/WildcardPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/YeetExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/YieldExpr.qll linguist-generated
 /lib/codeql/rust/elements.qll linguist-generated
-/test/extractor-tests/generated/AsmExpr/AsmExpr.ql linguist-generated
-/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.ql linguist-generated
-/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql linguist-generated
-/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.ql linguist-generated
-/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql linguist-generated
-/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql linguist-generated
-/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql linguist-generated
-/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql linguist-generated
-/test/extractor-tests/generated/BlockExpr/BlockExpr.ql linguist-generated
-/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.ql linguist-generated
-/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql linguist-generated
-/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.ql linguist-generated
-/test/extractor-tests/generated/BoxExpr/BoxExpr.ql linguist-generated
-/test/extractor-tests/generated/BoxPat/BoxPat.ql linguist-generated
-/test/extractor-tests/generated/BreakExpr/BreakExpr.ql linguist-generated
-/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.ql linguist-generated
-/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.ql linguist-generated
-/test/extractor-tests/generated/CallExpr/CallExpr.ql linguist-generated
-/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql linguist-generated
-/test/extractor-tests/generated/CastExpr/CastExpr.ql linguist-generated
-/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql linguist-generated
-/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.ql linguist-generated
-/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.ql linguist-generated
-/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql linguist-generated
-/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql linguist-generated
-/test/extractor-tests/generated/ConstExpr/ConstExpr.ql linguist-generated
-/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql linguist-generated
-/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.ql linguist-generated
-/test/extractor-tests/generated/ElementListExpr/ElementListExpr.ql linguist-generated
-/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.ql linguist-generated
-/test/extractor-tests/generated/ExprStmt/ExprStmt.ql linguist-generated
-/test/extractor-tests/generated/FieldExpr/FieldExpr.ql linguist-generated
-/test/extractor-tests/generated/Function/Function.ql linguist-generated
-/test/extractor-tests/generated/GenericArgList/GenericArgList.ql linguist-generated
-/test/extractor-tests/generated/IdentPat/IdentPat.ql linguist-generated
-/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql linguist-generated
-/test/extractor-tests/generated/IfExpr/IfExpr.ql linguist-generated
-/test/extractor-tests/generated/IfExpr/IfExpr_getElse.ql linguist-generated
-/test/extractor-tests/generated/IndexExpr/IndexExpr.ql linguist-generated
-/test/extractor-tests/generated/Label/Label.ql linguist-generated
-/test/extractor-tests/generated/LetExpr/LetExpr.ql linguist-generated
-/test/extractor-tests/generated/LetStmt/LetStmt.ql linguist-generated
-/test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql linguist-generated
-/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql linguist-generated
-/test/extractor-tests/generated/LetStmt/LetStmt_getType.ql linguist-generated
-/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql linguist-generated
-/test/extractor-tests/generated/LiteralPat/LiteralPat.ql linguist-generated
-/test/extractor-tests/generated/LoopExpr/LoopExpr.ql linguist-generated
-/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql linguist-generated
-/test/extractor-tests/generated/MatchArm/MatchArm.ql linguist-generated
-/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.ql linguist-generated
-/test/extractor-tests/generated/MatchExpr/MatchExpr.ql linguist-generated
-/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.ql linguist-generated
-/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql linguist-generated
-/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql linguist-generated
-/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.ql linguist-generated
-/test/extractor-tests/generated/MissingExpr/MissingExpr.ql linguist-generated
-/test/extractor-tests/generated/MissingPat/MissingPat.ql linguist-generated
-/test/extractor-tests/generated/Module/Module.ql linguist-generated
-/test/extractor-tests/generated/Module/Module_getDeclaration.ql linguist-generated
-/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql linguist-generated
-/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql linguist-generated
-/test/extractor-tests/generated/OrPat/OrPat.ql linguist-generated
-/test/extractor-tests/generated/OrPat/OrPat_getArg.ql linguist-generated
-/test/extractor-tests/generated/Path/Path.ql linguist-generated
-/test/extractor-tests/generated/PathExpr/PathExpr.ql linguist-generated
-/test/extractor-tests/generated/PathPat/PathPat.ql linguist-generated
-/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql linguist-generated
-/test/extractor-tests/generated/RangeExpr/RangeExpr.ql linguist-generated
-/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.ql linguist-generated
-/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.ql linguist-generated
-/test/extractor-tests/generated/RangePat/RangePat.ql linguist-generated
-/test/extractor-tests/generated/RangePat/RangePat_getEnd.ql linguist-generated
-/test/extractor-tests/generated/RangePat/RangePat_getStart.ql linguist-generated
-/test/extractor-tests/generated/RecordExpr/RecordExpr.ql linguist-generated
-/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.ql linguist-generated
-/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql linguist-generated
-/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.ql linguist-generated
-/test/extractor-tests/generated/RecordExprField/RecordExprField.ql linguist-generated
-/test/extractor-tests/generated/RecordPat/RecordPat.ql linguist-generated
-/test/extractor-tests/generated/RecordPat/RecordPat_getFld.ql linguist-generated
-/test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql linguist-generated
-/test/extractor-tests/generated/RecordPatField/RecordPatField.ql linguist-generated
-/test/extractor-tests/generated/RefExpr/RefExpr.ql linguist-generated
-/test/extractor-tests/generated/RefPat/RefPat.ql linguist-generated
-/test/extractor-tests/generated/RepeatExpr/RepeatExpr.ql linguist-generated
-/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql linguist-generated
-/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql linguist-generated
-/test/extractor-tests/generated/SlicePat/SlicePat.ql linguist-generated
-/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.ql linguist-generated
-/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.ql linguist-generated
-/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.ql linguist-generated
-/test/extractor-tests/generated/TupleExpr/TupleExpr.ql linguist-generated
-/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.ql linguist-generated
-/test/extractor-tests/generated/TuplePat/TuplePat.ql linguist-generated
-/test/extractor-tests/generated/TuplePat/TuplePat_getArg.ql linguist-generated
-/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.ql linguist-generated
-/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql linguist-generated
-/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.ql linguist-generated
-/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.ql linguist-generated
-/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql linguist-generated
-/test/extractor-tests/generated/TypeRef/TypeRef.ql linguist-generated
-/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql linguist-generated
-/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql linguist-generated
-/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql linguist-generated
-/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.ql linguist-generated
-/test/extractor-tests/generated/WildcardPat/WildcardPat.ql linguist-generated
-/test/extractor-tests/generated/YeetExpr/YeetExpr.ql linguist-generated
-/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.ql linguist-generated
-/test/extractor-tests/generated/YieldExpr/YieldExpr.ql linguist-generated
-/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/Abi/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ArgList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ArrayExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ArrayType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/AsmExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/AssocItemList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Attr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/AwaitExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/BecomeExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/BinaryExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/BlockExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/BoxPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/BreakExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/CallExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/CastExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ClosureBinder/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ClosureExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Const/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ConstArg/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ConstBlockPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ConstParam/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ContinueExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/DynTraitType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Enum/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ExprStmt/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ExternBlock/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ExternCrate/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ExternItemList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/FieldExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Fn/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/FnPtrType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ForExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ForType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/FormatArgsArg/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/GenericArgList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/GenericParamList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/IdentPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/IfExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Impl/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ImplTraitType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/IndexExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/InferType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ItemList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Label/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/LetElse/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/LetExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/LetStmt/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Lifetime/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/LifetimeArg/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/LifetimeParam/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Literal/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/LiteralPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/LoopExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MacroCall/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MacroDef/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MacroExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MacroPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MacroRules/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MacroType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MatchArm/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MatchArmList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MatchExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MatchGuard/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Meta/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/MethodCallExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Module/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Name/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/NameRef/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/NeverType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/OffsetOfExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/OrPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Param/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ParamList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ParenExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ParenPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ParenType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Path/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/PathExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/PathPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/PathSegment/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/PathType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/PrefixExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/PtrType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RangeExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RangePat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RecordExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RecordExprField/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RecordExprFieldList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RecordField/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RecordFieldList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RecordPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RecordPatField/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RecordPatFieldList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RefExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RefPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RefType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Rename/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RestPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/RetType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ReturnExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/ReturnTypeSyntax/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/SelfParam/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/SlicePat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/SliceType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/SourceFile/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Static/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/StmtList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Struct/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TokenTree/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Trait/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TraitAlias/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TryExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TupleExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TupleField/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TupleFieldList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TuplePat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TupleStructPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TupleType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TypeAlias/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TypeArg/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TypeBound/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TypeBoundList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/TypeParam/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/UnderscoreExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Union/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Use/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/UseTree/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/UseTreeList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Variant/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/VariantList/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/Visibility/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/WhereClause/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/WherePred/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/WhileExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/WildcardPat/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/YeetExpr/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/YieldExpr/MISSING_SOURCE.txt linguist-generated
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index 3716c5f63ebcf..8556d3c76adfb 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -3,78 +3,161 @@
  * This module exports all modules providing `Element` subclasses.
  */
 
+import codeql.rust.elements.Abi
+import codeql.rust.elements.Adt
+import codeql.rust.elements.ArgList
 import codeql.rust.elements.ArrayExpr
+import codeql.rust.elements.ArrayType
 import codeql.rust.elements.AsmExpr
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.AssocItemList
+import codeql.rust.elements.AssocTypeArg
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.AsyncBlockExpr
+import codeql.rust.elements.Attr
 import codeql.rust.elements.AwaitExpr
 import codeql.rust.elements.BecomeExpr
 import codeql.rust.elements.BinaryExpr
 import codeql.rust.elements.BlockExpr
-import codeql.rust.elements.BlockExprBase
-import codeql.rust.elements.BoxExpr
 import codeql.rust.elements.BoxPat
 import codeql.rust.elements.BreakExpr
 import codeql.rust.elements.CallExpr
 import codeql.rust.elements.CastExpr
+import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.ClosureExpr
+import codeql.rust.elements.Const
+import codeql.rust.elements.ConstArg
 import codeql.rust.elements.ConstBlockPat
-import codeql.rust.elements.ConstExpr
+import codeql.rust.elements.ConstParam
 import codeql.rust.elements.ContinueExpr
-import codeql.rust.elements.Declaration
+import codeql.rust.elements.DynTraitType
 import codeql.rust.elements.Element
-import codeql.rust.elements.ElementListExpr
+import codeql.rust.elements.Enum
 import codeql.rust.elements.Expr
 import codeql.rust.elements.ExprStmt
+import codeql.rust.elements.ExternBlock
+import codeql.rust.elements.ExternCrate
+import codeql.rust.elements.ExternItem
+import codeql.rust.elements.ExternItemList
 import codeql.rust.elements.FieldExpr
-import codeql.rust.elements.Function
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.Fn
+import codeql.rust.elements.FnPtrType
+import codeql.rust.elements.ForExpr
+import codeql.rust.elements.ForType
+import codeql.rust.elements.FormatArgsArg
+import codeql.rust.elements.FormatArgsExpr
+import codeql.rust.elements.GenericArg
 import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.GenericParam
+import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.IdentPat
 import codeql.rust.elements.IfExpr
+import codeql.rust.elements.Impl
+import codeql.rust.elements.ImplTraitType
 import codeql.rust.elements.IndexExpr
-import codeql.rust.elements.ItemStmt
+import codeql.rust.elements.InferType
+import codeql.rust.elements.Item
+import codeql.rust.elements.ItemList
 import codeql.rust.elements.Label
+import codeql.rust.elements.LetElse
 import codeql.rust.elements.LetExpr
 import codeql.rust.elements.LetStmt
-import codeql.rust.elements.LiteralExpr
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.LifetimeArg
+import codeql.rust.elements.LifetimeParam
+import codeql.rust.elements.Literal
 import codeql.rust.elements.LiteralPat
 import codeql.rust.elements.Locatable
 import codeql.rust.elements.LoopExpr
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.MacroDef
+import codeql.rust.elements.MacroExpr
+import codeql.rust.elements.MacroItems
+import codeql.rust.elements.MacroPat
+import codeql.rust.elements.MacroRules
+import codeql.rust.elements.MacroStmts
+import codeql.rust.elements.MacroType
 import codeql.rust.elements.MatchArm
+import codeql.rust.elements.MatchArmList
 import codeql.rust.elements.MatchExpr
+import codeql.rust.elements.MatchGuard
+import codeql.rust.elements.Meta
 import codeql.rust.elements.MethodCallExpr
 import codeql.rust.elements.Missing
-import codeql.rust.elements.MissingExpr
-import codeql.rust.elements.MissingPat
 import codeql.rust.elements.Module
+import codeql.rust.elements.Name
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.NeverType
 import codeql.rust.elements.OffsetOfExpr
 import codeql.rust.elements.OrPat
+import codeql.rust.elements.Param
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.ParenExpr
+import codeql.rust.elements.ParenPat
+import codeql.rust.elements.ParenType
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Path
 import codeql.rust.elements.PathExpr
 import codeql.rust.elements.PathPat
+import codeql.rust.elements.PathSegment
+import codeql.rust.elements.PathType
 import codeql.rust.elements.PrefixExpr
+import codeql.rust.elements.PtrType
 import codeql.rust.elements.RangeExpr
 import codeql.rust.elements.RangePat
 import codeql.rust.elements.RecordExpr
 import codeql.rust.elements.RecordExprField
+import codeql.rust.elements.RecordExprFieldList
+import codeql.rust.elements.RecordField
+import codeql.rust.elements.RecordFieldList
 import codeql.rust.elements.RecordPat
 import codeql.rust.elements.RecordPatField
+import codeql.rust.elements.RecordPatFieldList
 import codeql.rust.elements.RefExpr
 import codeql.rust.elements.RefPat
-import codeql.rust.elements.RepeatExpr
+import codeql.rust.elements.RefType
+import codeql.rust.elements.Rename
+import codeql.rust.elements.RestPat
+import codeql.rust.elements.RetType
 import codeql.rust.elements.ReturnExpr
+import codeql.rust.elements.ReturnTypeSyntax
+import codeql.rust.elements.SelfParam
 import codeql.rust.elements.SlicePat
+import codeql.rust.elements.SliceType
+import codeql.rust.elements.SourceFile
+import codeql.rust.elements.Static
 import codeql.rust.elements.Stmt
+import codeql.rust.elements.StmtList
+import codeql.rust.elements.Struct
+import codeql.rust.elements.TokenTree
+import codeql.rust.elements.Trait
+import codeql.rust.elements.TraitAlias
+import codeql.rust.elements.TryExpr
 import codeql.rust.elements.TupleExpr
+import codeql.rust.elements.TupleField
+import codeql.rust.elements.TupleFieldList
 import codeql.rust.elements.TuplePat
 import codeql.rust.elements.TupleStructPat
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TupleType
+import codeql.rust.elements.Type
+import codeql.rust.elements.TypeAlias
+import codeql.rust.elements.TypeArg
+import codeql.rust.elements.TypeBound
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeParam
 import codeql.rust.elements.UnderscoreExpr
 import codeql.rust.elements.Unextracted
 import codeql.rust.elements.Unimplemented
-import codeql.rust.elements.UnimplementedDeclaration
-import codeql.rust.elements.UnsafeBlockExpr
+import codeql.rust.elements.Union
+import codeql.rust.elements.Use
+import codeql.rust.elements.UseTree
+import codeql.rust.elements.UseTreeList
+import codeql.rust.elements.Variant
+import codeql.rust.elements.VariantList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+import codeql.rust.elements.WherePred
+import codeql.rust.elements.WhileExpr
 import codeql.rust.elements.WildcardPat
 import codeql.rust.elements.YeetExpr
 import codeql.rust.elements.YieldExpr
diff --git a/rust/ql/lib/codeql/rust/elements/Abi.qll b/rust/ql/lib/codeql/rust/elements/Abi.qll
new file mode 100644
index 0000000000000..a1872ae9c41b4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Abi.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Abi`.
+ */
+
+private import internal.AbiImpl
+import codeql.rust.elements.AstNode
+
+final class Abi = Impl::Abi;
diff --git a/rust/ql/lib/codeql/rust/elements/Adt.qll b/rust/ql/lib/codeql/rust/elements/Adt.qll
new file mode 100644
index 0000000000000..f2379b85bd63b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Adt.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Adt`.
+ */
+
+private import internal.AdtImpl
+import codeql.rust.elements.AstNode
+
+final class Adt = Impl::Adt;
diff --git a/rust/ql/lib/codeql/rust/elements/ArgList.qll b/rust/ql/lib/codeql/rust/elements/ArgList.qll
new file mode 100644
index 0000000000000..24ada531dc48f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ArgList.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ArgList`.
+ */
+
+private import internal.ArgListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+
+final class ArgList = Impl::ArgList;
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll b/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
index af6683a8be802..785933ea8947a 100644
--- a/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
@@ -4,13 +4,7 @@
  */
 
 private import internal.ArrayExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * An array expression. For example:
- * ```
- * [1, 2, 3];
- * [1; 10];
- * ```
- */
 final class ArrayExpr = Impl::ArrayExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayType.qll b/rust/ql/lib/codeql/rust/elements/ArrayType.qll
new file mode 100644
index 0000000000000..acc73367a88b4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ArrayType.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ArrayType`.
+ */
+
+private import internal.ArrayTypeImpl
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.Type
+
+final class ArrayType = Impl::ArrayType;
diff --git a/rust/ql/lib/codeql/rust/elements/AsmExpr.qll b/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
index b98f26fb96914..2dfc5e66a32e4 100644
--- a/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
@@ -4,14 +4,7 @@
  */
 
 private import internal.AsmExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * An inline assembly expression. For example:
- * ```
- * unsafe {
- *     builtin # asm(_);
- * }
- * ```
- */
 final class AsmExpr = Impl::AsmExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/AssocItem.qll b/rust/ql/lib/codeql/rust/elements/AssocItem.qll
new file mode 100644
index 0000000000000..c33fe834ee456
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/AssocItem.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `AssocItem`.
+ */
+
+private import internal.AssocItemImpl
+import codeql.rust.elements.AstNode
+
+final class AssocItem = Impl::AssocItem;
diff --git a/rust/ql/lib/codeql/rust/elements/AssocItemList.qll b/rust/ql/lib/codeql/rust/elements/AssocItemList.qll
new file mode 100644
index 0000000000000..1ca7cae640920
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/AssocItemList.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `AssocItemList`.
+ */
+
+private import internal.AssocItemListImpl
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+
+final class AssocItemList = Impl::AssocItemList;
diff --git a/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll b/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll
new file mode 100644
index 0000000000000..081d0d72a706b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `AssocTypeArg`.
+ */
+
+private import internal.AssocTypeArgImpl
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.GenericArg
+import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
+import codeql.rust.elements.ReturnTypeSyntax
+import codeql.rust.elements.Type
+import codeql.rust.elements.TypeBoundList
+
+final class AssocTypeArg = Impl::AssocTypeArg;
diff --git a/rust/ql/lib/codeql/rust/elements/AsyncBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/AsyncBlockExpr.qll
deleted file mode 100644
index 82581fb3f56c2..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/AsyncBlockExpr.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `AsyncBlockExpr`.
- */
-
-private import internal.AsyncBlockExprImpl
-import codeql.rust.elements.BlockExprBase
-
-/**
- * An async block expression. For example:
- * ```
- * async {
- *    let x = 42;
- *    x
- * }.await
- * ```
- */
-final class AsyncBlockExpr = Impl::AsyncBlockExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/Attr.qll b/rust/ql/lib/codeql/rust/elements/Attr.qll
new file mode 100644
index 0000000000000..1f75bf11d6560
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Attr.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Attr`.
+ */
+
+private import internal.AttrImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Meta
+
+final class Attr = Impl::Attr;
diff --git a/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll b/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll
index 4b00e9348f100..44d0bf7a18623 100644
--- a/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/AwaitExpr.qll
@@ -4,15 +4,7 @@
  */
 
 private import internal.AwaitExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * An `await` expression. For example:
- * ```
- * async {
- *     let x = foo().await;
- *     x
- * }
- * ```
- */
 final class AwaitExpr = Impl::AwaitExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll b/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll
index daa3abb5a0a60..cac2ccfa7a728 100644
--- a/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BecomeExpr.qll
@@ -4,17 +4,7 @@
  */
 
 private import internal.BecomeExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * A `become` expression. For example:
- * ```
- * fn fact_a(n: i32, a: i32) -> i32 {
- *      if n == 0 {
- *          a
- *      } else {
- *          become fact_a(n - 1, n * a)
- *      }
- *  }    ```
- */
 final class BecomeExpr = Impl::BecomeExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll b/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll
index 946ff311ebc34..9b312ac96332e 100644
--- a/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll
@@ -4,16 +4,7 @@
  */
 
 private import internal.BinaryExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * A binary operation expression. For example:
- * ```
- * x + y;
- * x && y;
- * x <= y;
- * x = y;
- * x += y;
- * ```
- */
 final class BinaryExpr = Impl::BinaryExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/BlockExpr.qll b/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
index a81527ef3aa9a..9f99a43e6a802 100644
--- a/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
@@ -4,21 +4,9 @@
  */
 
 private import internal.BlockExprImpl
-import codeql.rust.elements.BlockExprBase
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
 import codeql.rust.elements.Label
+import codeql.rust.elements.StmtList
 
-/**
- * A block expression. For example:
- * ```
- * {
- *     let x = 42;
- * }
- * ```
- * ```
- * 'label: {
- *     let x = 42;
- *     x
- * }
- * ```
- */
 final class BlockExpr = Impl::BlockExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/BlockExprBase.qll b/rust/ql/lib/codeql/rust/elements/BlockExprBase.qll
deleted file mode 100644
index 15390bbc1b227..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/BlockExprBase.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `BlockExprBase`.
- */
-
-private import internal.BlockExprBaseImpl
-import codeql.rust.elements.Expr
-import codeql.rust.elements.Stmt
-
-final class BlockExprBase = Impl::BlockExprBase;
diff --git a/rust/ql/lib/codeql/rust/elements/BoxExpr.qll b/rust/ql/lib/codeql/rust/elements/BoxExpr.qll
deleted file mode 100644
index 580952240a4e6..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/BoxExpr.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `BoxExpr`.
- */
-
-private import internal.BoxExprImpl
-import codeql.rust.elements.Expr
-
-/**
- * A box expression. For example:
- * ```
- * let x = #[rustc_box] Box::new(42);
- * ```
- */
-final class BoxExpr = Impl::BoxExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/BoxPat.qll b/rust/ql/lib/codeql/rust/elements/BoxPat.qll
index 72fc202ca5fd7..23e9cc4ff83d7 100644
--- a/rust/ql/lib/codeql/rust/elements/BoxPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/BoxPat.qll
@@ -6,13 +6,4 @@
 private import internal.BoxPatImpl
 import codeql.rust.elements.Pat
 
-/**
- * A box pattern. For example:
- * ```
- * match x {
- *     box Option::Some(y) => y,
- *     box Option::None => 0,
- * };
- * ```
- */
 final class BoxPat = Impl::BoxPat;
diff --git a/rust/ql/lib/codeql/rust/elements/BreakExpr.qll b/rust/ql/lib/codeql/rust/elements/BreakExpr.qll
index a3b5b07cbcbcb..fdc214645812a 100644
--- a/rust/ql/lib/codeql/rust/elements/BreakExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BreakExpr.qll
@@ -4,24 +4,8 @@
  */
 
 private import internal.BreakExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.Label
+import codeql.rust.elements.Lifetime
 
-/**
- * A break expression. For example:
- * ```
- * loop {
- *     if not_ready() {
- *         break;
- *      }
- * }
- * ```
- * ```
- * let x = 'label: loop {
- *     if done() {
- *         break 'label 42;
- *     }
- * };
- * ```
- */
 final class BreakExpr = Impl::BreakExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/CallExpr.qll b/rust/ql/lib/codeql/rust/elements/CallExpr.qll
index 88a961e155f5b..5aee9f2aa608e 100644
--- a/rust/ql/lib/codeql/rust/elements/CallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/CallExpr.qll
@@ -4,15 +4,8 @@
  */
 
 private import internal.CallExprImpl
+import codeql.rust.elements.ArgList
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * A function call expression. For example:
- * ```
- * foo(42);
- * foo::<u32, u64>(42);
- * foo[0](42);
- * foo(1) = 4;
- * ```
- */
 final class CallExpr = Impl::CallExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/CastExpr.qll b/rust/ql/lib/codeql/rust/elements/CastExpr.qll
index fc711bef2c617..34446ed4e68d0 100644
--- a/rust/ql/lib/codeql/rust/elements/CastExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/CastExpr.qll
@@ -4,13 +4,8 @@
  */
 
 private import internal.CastExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Type
 
-/**
- * A cast expression. For example:
- * ```
- * value as u64;
- * ```
- */
 final class CastExpr = Impl::CastExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ClosureBinder.qll b/rust/ql/lib/codeql/rust/elements/ClosureBinder.qll
new file mode 100644
index 0000000000000..70c8c25626e74
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ClosureBinder.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ClosureBinder`.
+ */
+
+private import internal.ClosureBinderImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.GenericParamList
+
+final class ClosureBinder = Impl::ClosureBinder;
diff --git a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
index 65ca9ee52aca8..645a8e40d97c5 100644
--- a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
@@ -4,20 +4,10 @@
  */
 
 private import internal.ClosureExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
-import codeql.rust.elements.Pat
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
 
-/**
- * A closure expression. For example:
- * ```
- * |x| x + 1;
- * move |x: i32| -> i32 { x + 1 };
- * async |x: i32, y| x + y;
- *  #[coroutine]
- * |x| yield x;
- *  #[coroutine]
- *  static |x| yield x;
- * ```
- */
 final class ClosureExpr = Impl::ClosureExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/Const.qll b/rust/ql/lib/codeql/rust/elements/Const.qll
new file mode 100644
index 0000000000000..c1ab5bcc2494a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Const.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Const`.
+ */
+
+private import internal.ConstImpl
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+import codeql.rust.elements.Visibility
+
+final class Const = Impl::Const;
diff --git a/rust/ql/lib/codeql/rust/elements/ConstArg.qll b/rust/ql/lib/codeql/rust/elements/ConstArg.qll
new file mode 100644
index 0000000000000..774bd61e097a5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ConstArg.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ConstArg`.
+ */
+
+private import internal.ConstArgImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.GenericArg
+
+final class ConstArg = Impl::ConstArg;
diff --git a/rust/ql/lib/codeql/rust/elements/ConstBlockPat.qll b/rust/ql/lib/codeql/rust/elements/ConstBlockPat.qll
index 487dee50ced3d..1adeb059ebe4e 100644
--- a/rust/ql/lib/codeql/rust/elements/ConstBlockPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/ConstBlockPat.qll
@@ -4,16 +4,7 @@
  */
 
 private import internal.ConstBlockPatImpl
-import codeql.rust.elements.Expr
+import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Pat
 
-/**
- * A const block pattern. For example:
- * ```
- * match x {
- *     const { 1 + 2 + 3 } => "ok",
- *     _ => "fail",
- * };
- * ```
- */
 final class ConstBlockPat = Impl::ConstBlockPat;
diff --git a/rust/ql/lib/codeql/rust/elements/ConstExpr.qll b/rust/ql/lib/codeql/rust/elements/ConstExpr.qll
deleted file mode 100644
index 9c52cec7fce65..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/ConstExpr.qll
+++ /dev/null
@@ -1,17 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ConstExpr`.
- */
-
-private import internal.ConstExprImpl
-import codeql.rust.elements.Expr
-
-/**
- * A `const` block expression. For example:
- * ```
- * if const { SRC::IS_ZST || DEST::IS_ZST || mem::align_of::<SRC>() != mem::align_of::<DEST>() } {
- *     return false;
- * }
- * ```
- */
-final class ConstExpr = Impl::ConstExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ConstParam.qll b/rust/ql/lib/codeql/rust/elements/ConstParam.qll
new file mode 100644
index 0000000000000..b2621561e642f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ConstParam.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ConstParam`.
+ */
+
+private import internal.ConstParamImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.GenericParam
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+
+final class ConstParam = Impl::ConstParam;
diff --git a/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll b/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll
index 4b04659da9b20..24c1093ef65bc 100644
--- a/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ContinueExpr.qll
@@ -4,24 +4,8 @@
  */
 
 private import internal.ContinueExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.Label
+import codeql.rust.elements.Lifetime
 
-/**
- * A continue expression. For example:
- * ```
- * loop {
- *     if not_ready() {
- *         continue;
- *     }
- * }
- * ```
- * ```
- * 'label: loop {
- *     if not_ready() {
- *         continue 'label;
- *     }
- * }
- * ```
- */
 final class ContinueExpr = Impl::ContinueExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/Declaration.qll b/rust/ql/lib/codeql/rust/elements/Declaration.qll
deleted file mode 100644
index 6cbea51c058b6..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/Declaration.qll
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `Declaration`.
- */
-
-private import internal.DeclarationImpl
-import codeql.rust.elements.AstNode
-
-/**
- * The base class for declarations.
- */
-final class Declaration = Impl::Declaration;
diff --git a/rust/ql/lib/codeql/rust/elements/DynTraitType.qll b/rust/ql/lib/codeql/rust/elements/DynTraitType.qll
new file mode 100644
index 0000000000000..aa8bd539cb4da
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/DynTraitType.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `DynTraitType`.
+ */
+
+private import internal.DynTraitTypeImpl
+import codeql.rust.elements.Type
+import codeql.rust.elements.TypeBoundList
+
+final class DynTraitType = Impl::DynTraitType;
diff --git a/rust/ql/lib/codeql/rust/elements/ElementListExpr.qll b/rust/ql/lib/codeql/rust/elements/ElementListExpr.qll
deleted file mode 100644
index c12f33e5359c0..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/ElementListExpr.qll
+++ /dev/null
@@ -1,17 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ElementListExpr`.
- */
-
-private import internal.ElementListExprImpl
-import codeql.rust.elements.ArrayExpr
-import codeql.rust.elements.Expr
-
-/**
- * An element list expression. For example:
- * ```
- * [1, 2, 3, 4, 5];
- * [1, 2, 3, 4, 5][0] = 6;
- * ```
- */
-final class ElementListExpr = Impl::ElementListExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/Enum.qll b/rust/ql/lib/codeql/rust/elements/Enum.qll
new file mode 100644
index 0000000000000..16b7fe46ffc40
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Enum.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Enum`.
+ */
+
+private import internal.EnumImpl
+import codeql.rust.elements.Adt
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.VariantList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+final class Enum = Impl::Enum;
diff --git a/rust/ql/lib/codeql/rust/elements/Expr.qll b/rust/ql/lib/codeql/rust/elements/Expr.qll
index b91061856a950..ed10a1a043373 100644
--- a/rust/ql/lib/codeql/rust/elements/Expr.qll
+++ b/rust/ql/lib/codeql/rust/elements/Expr.qll
@@ -6,7 +6,4 @@
 private import internal.ExprImpl
 import codeql.rust.elements.AstNode
 
-/**
- * The base class for expressions.
- */
 final class Expr = Impl::Expr;
diff --git a/rust/ql/lib/codeql/rust/elements/ExprStmt.qll b/rust/ql/lib/codeql/rust/elements/ExprStmt.qll
index 635b95e26a432..88e95ae7a460b 100644
--- a/rust/ql/lib/codeql/rust/elements/ExprStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/ExprStmt.qll
@@ -7,12 +7,4 @@ private import internal.ExprStmtImpl
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Stmt
 
-/**
- * An expression statement. For example:
- * ```
- * start();
- * finish()
- * use std::env;
- * ```
- */
 final class ExprStmt = Impl::ExprStmt;
diff --git a/rust/ql/lib/codeql/rust/elements/ExternBlock.qll b/rust/ql/lib/codeql/rust/elements/ExternBlock.qll
new file mode 100644
index 0000000000000..d9f5dbd84fbc4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ExternBlock.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ExternBlock`.
+ */
+
+private import internal.ExternBlockImpl
+import codeql.rust.elements.Abi
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItemList
+import codeql.rust.elements.Item
+
+final class ExternBlock = Impl::ExternBlock;
diff --git a/rust/ql/lib/codeql/rust/elements/ExternCrate.qll b/rust/ql/lib/codeql/rust/elements/ExternCrate.qll
new file mode 100644
index 0000000000000..1449667196c3c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ExternCrate.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ExternCrate`.
+ */
+
+private import internal.ExternCrateImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.Rename
+import codeql.rust.elements.Visibility
+
+final class ExternCrate = Impl::ExternCrate;
diff --git a/rust/ql/lib/codeql/rust/elements/ExternItem.qll b/rust/ql/lib/codeql/rust/elements/ExternItem.qll
new file mode 100644
index 0000000000000..aa7a8101c087f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ExternItem.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ExternItem`.
+ */
+
+private import internal.ExternItemImpl
+import codeql.rust.elements.AstNode
+
+final class ExternItem = Impl::ExternItem;
diff --git a/rust/ql/lib/codeql/rust/elements/ExternItemList.qll b/rust/ql/lib/codeql/rust/elements/ExternItemList.qll
new file mode 100644
index 0000000000000..efb36b15be650
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ExternItemList.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ExternItemList`.
+ */
+
+private import internal.ExternItemListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItem
+
+final class ExternItemList = Impl::ExternItemList;
diff --git a/rust/ql/lib/codeql/rust/elements/FieldExpr.qll b/rust/ql/lib/codeql/rust/elements/FieldExpr.qll
index 684ea66dfff70..c855ba37e65fa 100644
--- a/rust/ql/lib/codeql/rust/elements/FieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/FieldExpr.qll
@@ -4,12 +4,8 @@
  */
 
 private import internal.FieldExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.NameRef
 
-/**
- * A field access expression. For example:
- * ```
- * x.foo
- * ```
- */
 final class FieldExpr = Impl::FieldExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/FieldList.qll b/rust/ql/lib/codeql/rust/elements/FieldList.qll
new file mode 100644
index 0000000000000..646d1ad91641e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FieldList.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FieldList`.
+ */
+
+private import internal.FieldListImpl
+import codeql.rust.elements.AstNode
+
+final class FieldList = Impl::FieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/Fn.qll b/rust/ql/lib/codeql/rust/elements/Fn.qll
new file mode 100644
index 0000000000000..0818070a78538
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Fn.qll
@@ -0,0 +1,20 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Fn`.
+ */
+
+private import internal.FnImpl
+import codeql.rust.elements.Abi
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.ExternItem
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+final class Fn = Impl::Fn;
diff --git a/rust/ql/lib/codeql/rust/elements/FnPtrType.qll b/rust/ql/lib/codeql/rust/elements/FnPtrType.qll
new file mode 100644
index 0000000000000..87e9ba9773439
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FnPtrType.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FnPtrType`.
+ */
+
+private import internal.FnPtrTypeImpl
+import codeql.rust.elements.Abi
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
+import codeql.rust.elements.Type
+
+final class FnPtrType = Impl::FnPtrType;
diff --git a/rust/ql/lib/codeql/rust/elements/ForExpr.qll b/rust/ql/lib/codeql/rust/elements/ForExpr.qll
new file mode 100644
index 0000000000000..1a4a712576af1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ForExpr.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ForExpr`.
+ */
+
+private import internal.ForExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Label
+import codeql.rust.elements.Pat
+
+final class ForExpr = Impl::ForExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ForType.qll b/rust/ql/lib/codeql/rust/elements/ForType.qll
new file mode 100644
index 0000000000000..7160fcebbe12e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ForType.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ForType`.
+ */
+
+private import internal.ForTypeImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Type
+
+final class ForType = Impl::ForType;
diff --git a/rust/ql/lib/codeql/rust/elements/FormatArgsArg.qll b/rust/ql/lib/codeql/rust/elements/FormatArgsArg.qll
new file mode 100644
index 0000000000000..e568667170d9a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FormatArgsArg.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FormatArgsArg`.
+ */
+
+private import internal.FormatArgsArgImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Name
+
+final class FormatArgsArg = Impl::FormatArgsArg;
diff --git a/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll b/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll
new file mode 100644
index 0000000000000..510ab7163139b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FormatArgsExpr`.
+ */
+
+private import internal.FormatArgsExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.FormatArgsArg
+
+final class FormatArgsExpr = Impl::FormatArgsExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/Function.qll b/rust/ql/lib/codeql/rust/elements/Function.qll
deleted file mode 100644
index 1d6dcd8274b87..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/Function.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `Function`.
- */
-
-private import internal.FunctionImpl
-import codeql.rust.elements.Declaration
-import codeql.rust.elements.Expr
-
-/**
- * A function declaration. For example
- * ```
- * fn foo(x: u32) -> u64 {(x + 1).into()}
- * ```
- * A function declaration within a trait might not have a body:
- * ```
- * trait Trait {
- *     fn bar();
- * }
- * ```
- */
-final class Function = Impl::Function;
diff --git a/rust/ql/lib/codeql/rust/elements/GenericArg.qll b/rust/ql/lib/codeql/rust/elements/GenericArg.qll
new file mode 100644
index 0000000000000..b046213580217
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/GenericArg.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `GenericArg`.
+ */
+
+private import internal.GenericArgImpl
+import codeql.rust.elements.AstNode
+
+final class GenericArg = Impl::GenericArg;
diff --git a/rust/ql/lib/codeql/rust/elements/GenericArgList.qll b/rust/ql/lib/codeql/rust/elements/GenericArgList.qll
index 60bd21c5d4a38..b677acebfb187 100644
--- a/rust/ql/lib/codeql/rust/elements/GenericArgList.qll
+++ b/rust/ql/lib/codeql/rust/elements/GenericArgList.qll
@@ -5,12 +5,6 @@
 
 private import internal.GenericArgListImpl
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Unimplemented
+import codeql.rust.elements.GenericArg
 
-/**
- * The base class for generic arguments.
- * ```
- * x.foo::<u32, u64>(42);
- * ```
- */
 final class GenericArgList = Impl::GenericArgList;
diff --git a/rust/ql/lib/codeql/rust/elements/GenericParam.qll b/rust/ql/lib/codeql/rust/elements/GenericParam.qll
new file mode 100644
index 0000000000000..873a5d858f06e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/GenericParam.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `GenericParam`.
+ */
+
+private import internal.GenericParamImpl
+import codeql.rust.elements.AstNode
+
+final class GenericParam = Impl::GenericParam;
diff --git a/rust/ql/lib/codeql/rust/elements/GenericParamList.qll b/rust/ql/lib/codeql/rust/elements/GenericParamList.qll
new file mode 100644
index 0000000000000..79d33c9a926e1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/GenericParamList.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `GenericParamList`.
+ */
+
+private import internal.GenericParamListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.GenericParam
+
+final class GenericParamList = Impl::GenericParamList;
diff --git a/rust/ql/lib/codeql/rust/elements/IdentPat.qll b/rust/ql/lib/codeql/rust/elements/IdentPat.qll
index a9d67fcbb08a4..09cd5b22ed16c 100644
--- a/rust/ql/lib/codeql/rust/elements/IdentPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/IdentPat.qll
@@ -4,21 +4,8 @@
  */
 
 private import internal.IdentPatImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Name
 import codeql.rust.elements.Pat
 
-/**
- * A binding pattern. For example:
- * ```
- * match x {
- *     Option::Some(y) => y,
- *     Option::None => 0,
- * };
- * ```
- * ```
- * match x {
- *     y@Option::Some(_) => y,
- *     Option::None => 0,
- * };
- * ```
- */
 final class IdentPat = Impl::IdentPat;
diff --git a/rust/ql/lib/codeql/rust/elements/IfExpr.qll b/rust/ql/lib/codeql/rust/elements/IfExpr.qll
index ed3b588185666..48bda448aa594 100644
--- a/rust/ql/lib/codeql/rust/elements/IfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/IfExpr.qll
@@ -4,21 +4,8 @@
  */
 
 private import internal.IfExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Expr
 
-/**
- * An `if` expression. For example:
- * ```
- * if x == 42 {
- *     println!("that's the answer");
- * }
- * ```
- * ```
- * let y = if x > 0 {
- *     1
- * } else {
- *     0
- * }
- * ```
- */
 final class IfExpr = Impl::IfExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/Impl.qll b/rust/ql/lib/codeql/rust/elements/Impl.qll
new file mode 100644
index 0000000000000..e0d7f4f8ce72f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Impl.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Impl`.
+ */
+
+private import internal.ImplImpl
+import codeql.rust.elements.AssocItemList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Type
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+final class Impl = Impl::Impl;
diff --git a/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll b/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll
new file mode 100644
index 0000000000000..932ae79feec09
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ImplTraitType`.
+ */
+
+private import internal.ImplTraitTypeImpl
+import codeql.rust.elements.Type
+import codeql.rust.elements.TypeBoundList
+
+final class ImplTraitType = Impl::ImplTraitType;
diff --git a/rust/ql/lib/codeql/rust/elements/IndexExpr.qll b/rust/ql/lib/codeql/rust/elements/IndexExpr.qll
index cfceb70b83622..29550835793ec 100644
--- a/rust/ql/lib/codeql/rust/elements/IndexExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/IndexExpr.qll
@@ -4,13 +4,7 @@
  */
 
 private import internal.IndexExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * An index expression. For example:
- * ```
- * list[42];
- * list[42] = 1;
- * ```
- */
 final class IndexExpr = Impl::IndexExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/InferType.qll b/rust/ql/lib/codeql/rust/elements/InferType.qll
new file mode 100644
index 0000000000000..28bd412f24b0c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/InferType.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `InferType`.
+ */
+
+private import internal.InferTypeImpl
+import codeql.rust.elements.Type
+
+final class InferType = Impl::InferType;
diff --git a/rust/ql/lib/codeql/rust/elements/Item.qll b/rust/ql/lib/codeql/rust/elements/Item.qll
new file mode 100644
index 0000000000000..9035620b48b12
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Item.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Item`.
+ */
+
+private import internal.ItemImpl
+import codeql.rust.elements.Stmt
+
+final class Item = Impl::Item;
diff --git a/rust/ql/lib/codeql/rust/elements/ItemList.qll b/rust/ql/lib/codeql/rust/elements/ItemList.qll
new file mode 100644
index 0000000000000..41f4090f7a14b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ItemList.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ItemList`.
+ */
+
+private import internal.ItemListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+
+final class ItemList = Impl::ItemList;
diff --git a/rust/ql/lib/codeql/rust/elements/ItemStmt.qll b/rust/ql/lib/codeql/rust/elements/ItemStmt.qll
deleted file mode 100644
index 8ba14959d020f..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/ItemStmt.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ItemStmt`.
- */
-
-private import internal.ItemStmtImpl
-import codeql.rust.elements.Stmt
-
-/**
- * An item statement. For example:
- * ```
- * fn print_hello() {
- *     println!("Hello, world!");
- * }
- * print_hello();
- * ```
- */
-final class ItemStmt = Impl::ItemStmt;
diff --git a/rust/ql/lib/codeql/rust/elements/Label.qll b/rust/ql/lib/codeql/rust/elements/Label.qll
index ed2e9c19767ad..dfeca837d4059 100644
--- a/rust/ql/lib/codeql/rust/elements/Label.qll
+++ b/rust/ql/lib/codeql/rust/elements/Label.qll
@@ -5,14 +5,6 @@
 
 private import internal.LabelImpl
 import codeql.rust.elements.AstNode
+import codeql.rust.elements.Lifetime
 
-/**
- * A label. For example:
- * ```
- * 'label: loop {
- *     println!("Hello, world (once)!");
- *     break 'label;
- * };
- * ```
- */
 final class Label = Impl::Label;
diff --git a/rust/ql/lib/codeql/rust/elements/LetElse.qll b/rust/ql/lib/codeql/rust/elements/LetElse.qll
new file mode 100644
index 0000000000000..85aa3857d9e79
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/LetElse.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `LetElse`.
+ */
+
+private import internal.LetElseImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.BlockExpr
+
+final class LetElse = Impl::LetElse;
diff --git a/rust/ql/lib/codeql/rust/elements/LetExpr.qll b/rust/ql/lib/codeql/rust/elements/LetExpr.qll
index 27a6e7c1e1d82..9ead73ee470e4 100644
--- a/rust/ql/lib/codeql/rust/elements/LetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/LetExpr.qll
@@ -4,15 +4,8 @@
  */
 
 private import internal.LetExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Pat
 
-/**
- * A `let` expression. For example:
- * ```
- * if let Some(x) = maybe_some {
- *     println!("{}", x);
- * }
- * ```
- */
 final class LetExpr = Impl::LetExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/LetStmt.qll b/rust/ql/lib/codeql/rust/elements/LetStmt.qll
index 4588e9939e215..30104dc44d82f 100644
--- a/rust/ql/lib/codeql/rust/elements/LetStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/LetStmt.qll
@@ -4,21 +4,11 @@
  */
 
 private import internal.LetStmtImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.LetElse
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Stmt
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Type
 
-/**
- * A let statement. For example:
- * ```
- * let x = 42;
- * let x: i32 = 42;
- * let x: i32;
- * let x;
- * let (x, y) = (1, 2);
- * let Some(x) = std::env::var("FOO") else {
- *     return;
- * };
- */
 final class LetStmt = Impl::LetStmt;
diff --git a/rust/ql/lib/codeql/rust/elements/Lifetime.qll b/rust/ql/lib/codeql/rust/elements/Lifetime.qll
new file mode 100644
index 0000000000000..cd2c6756a0928
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Lifetime.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Lifetime`.
+ */
+
+private import internal.LifetimeImpl
+import codeql.rust.elements.AstNode
+
+final class Lifetime = Impl::Lifetime;
diff --git a/rust/ql/lib/codeql/rust/elements/LifetimeArg.qll b/rust/ql/lib/codeql/rust/elements/LifetimeArg.qll
new file mode 100644
index 0000000000000..9ee40ebc7df13
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/LifetimeArg.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `LifetimeArg`.
+ */
+
+private import internal.LifetimeArgImpl
+import codeql.rust.elements.GenericArg
+import codeql.rust.elements.Lifetime
+
+final class LifetimeArg = Impl::LifetimeArg;
diff --git a/rust/ql/lib/codeql/rust/elements/LifetimeParam.qll b/rust/ql/lib/codeql/rust/elements/LifetimeParam.qll
new file mode 100644
index 0000000000000..281dd65171cc5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/LifetimeParam.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `LifetimeParam`.
+ */
+
+private import internal.LifetimeParamImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParam
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeBoundList
+
+final class LifetimeParam = Impl::LifetimeParam;
diff --git a/rust/ql/lib/codeql/rust/elements/Literal.qll b/rust/ql/lib/codeql/rust/elements/Literal.qll
new file mode 100644
index 0000000000000..982013750433d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Literal.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Literal`.
+ */
+
+private import internal.LiteralImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+
+final class Literal = Impl::Literal;
diff --git a/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll b/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll
deleted file mode 100644
index 39cef053fabaa..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll
+++ /dev/null
@@ -1,21 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `LiteralExpr`.
- */
-
-private import internal.LiteralExprImpl
-import codeql.rust.elements.Expr
-
-/**
- * A literal expression. For example:
- * ```
- * 42;
- * 42.0;
- * "Hello, world!";
- * b"Hello, world!";
- * 'x';
- * b'x';
- * r"Hello, world!";
- * true;
- */
-final class LiteralExpr = Impl::LiteralExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/LiteralPat.qll b/rust/ql/lib/codeql/rust/elements/LiteralPat.qll
index 79546c4d4bf0a..863c348a314e4 100644
--- a/rust/ql/lib/codeql/rust/elements/LiteralPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/LiteralPat.qll
@@ -4,16 +4,7 @@
  */
 
 private import internal.LiteralPatImpl
-import codeql.rust.elements.Expr
+import codeql.rust.elements.Literal
 import codeql.rust.elements.Pat
 
-/**
- * A literal pattern. For example:
- * ```
- * match x {
- *     42 => "ok",
- *     _ => "fail",
- * }
- * ```
- */
 final class LiteralPat = Impl::LiteralPat;
diff --git a/rust/ql/lib/codeql/rust/elements/LoopExpr.qll b/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
index 1764d8c0a19db..d1f512db722c5 100644
--- a/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
@@ -4,31 +4,9 @@
  */
 
 private import internal.LoopExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Label
 
-/**
- * A loop expression. For example:
- * ```
- * loop {
- *     println!("Hello, world (again)!");
- * };
- * ```
- * ```
- * 'label: loop {
- *     println!("Hello, world (once)!");
- *     break 'label;
- * };
- * ```
- * ```
- * let mut x = 0;
- * loop {
- *     if x < 10 {
- *         x += 1;
- *     } else {
- *         break;
- *     }
- * };
- * ```
- */
 final class LoopExpr = Impl::LoopExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroCall.qll b/rust/ql/lib/codeql/rust/elements/MacroCall.qll
new file mode 100644
index 0000000000000..4631dfa66e743
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroCall.qll
@@ -0,0 +1,14 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroCall`.
+ */
+
+private import internal.MacroCallImpl
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItem
+import codeql.rust.elements.Item
+import codeql.rust.elements.Path
+import codeql.rust.elements.TokenTree
+
+final class MacroCall = Impl::MacroCall;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroDef.qll b/rust/ql/lib/codeql/rust/elements/MacroDef.qll
new file mode 100644
index 0000000000000..03785e6ad3b2e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroDef.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroDef`.
+ */
+
+private import internal.MacroDefImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.TokenTree
+import codeql.rust.elements.Visibility
+
+final class MacroDef = Impl::MacroDef;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroExpr.qll b/rust/ql/lib/codeql/rust/elements/MacroExpr.qll
new file mode 100644
index 0000000000000..4fcfdf7fa30c7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroExpr.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroExpr`.
+ */
+
+private import internal.MacroExprImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.MacroCall
+
+final class MacroExpr = Impl::MacroExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroItems.qll b/rust/ql/lib/codeql/rust/elements/MacroItems.qll
new file mode 100644
index 0000000000000..621c9884a57d8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroItems.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroItems`.
+ */
+
+private import internal.MacroItemsImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Item
+
+final class MacroItems = Impl::MacroItems;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroPat.qll b/rust/ql/lib/codeql/rust/elements/MacroPat.qll
new file mode 100644
index 0000000000000..1fa9e5a0fb200
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroPat.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroPat`.
+ */
+
+private import internal.MacroPatImpl
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.Pat
+
+final class MacroPat = Impl::MacroPat;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroRules.qll b/rust/ql/lib/codeql/rust/elements/MacroRules.qll
new file mode 100644
index 0000000000000..8f70ed3778c61
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroRules.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroRules`.
+ */
+
+private import internal.MacroRulesImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.TokenTree
+import codeql.rust.elements.Visibility
+
+final class MacroRules = Impl::MacroRules;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroStmts.qll b/rust/ql/lib/codeql/rust/elements/MacroStmts.qll
new file mode 100644
index 0000000000000..a47f35ddeba55
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroStmts.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroStmts`.
+ */
+
+private import internal.MacroStmtsImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Stmt
+
+final class MacroStmts = Impl::MacroStmts;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroType.qll b/rust/ql/lib/codeql/rust/elements/MacroType.qll
new file mode 100644
index 0000000000000..46dedd11ba4ba
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroType.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroType`.
+ */
+
+private import internal.MacroTypeImpl
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.Type
+
+final class MacroType = Impl::MacroType;
diff --git a/rust/ql/lib/codeql/rust/elements/MatchArm.qll b/rust/ql/lib/codeql/rust/elements/MatchArm.qll
index 643db33637b57..c49dc73102f72 100644
--- a/rust/ql/lib/codeql/rust/elements/MatchArm.qll
+++ b/rust/ql/lib/codeql/rust/elements/MatchArm.qll
@@ -5,22 +5,9 @@
 
 private import internal.MatchArmImpl
 import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.MatchGuard
 import codeql.rust.elements.Pat
 
-/**
- * A match arm. For example:
- * ```
- * match x {
- *     Option::Some(y) => y,
- *     Option::None => 0,
- * };
- * ```
- * ```
- * match x {
- *     Some(y) if y != 0 => 1 / y,
- *     _ => 0,
- * };
- * ```
- */
 final class MatchArm = Impl::MatchArm;
diff --git a/rust/ql/lib/codeql/rust/elements/MatchArmList.qll b/rust/ql/lib/codeql/rust/elements/MatchArmList.qll
new file mode 100644
index 0000000000000..1aa2cd7f8e585
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MatchArmList.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MatchArmList`.
+ */
+
+private import internal.MatchArmListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.MatchArm
+
+final class MatchArmList = Impl::MatchArmList;
diff --git a/rust/ql/lib/codeql/rust/elements/MatchExpr.qll b/rust/ql/lib/codeql/rust/elements/MatchExpr.qll
index 1fc3b4c5b310d..7057494a969e2 100644
--- a/rust/ql/lib/codeql/rust/elements/MatchExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MatchExpr.qll
@@ -4,22 +4,8 @@
  */
 
 private import internal.MatchExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.MatchArm
+import codeql.rust.elements.MatchArmList
 
-/**
- * A match expression. For example:
- * ```
- * match x {
- *     Option::Some(y) => y,
- *     Option::None => 0,
- * }
- * ```
- * ```
- * match x {
- *     Some(y) if y != 0 => 1 / y,
- *     _ => 0,
- * }
- * ```
- */
 final class MatchExpr = Impl::MatchExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/MatchGuard.qll b/rust/ql/lib/codeql/rust/elements/MatchGuard.qll
new file mode 100644
index 0000000000000..348a3b6354c0a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MatchGuard.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MatchGuard`.
+ */
+
+private import internal.MatchGuardImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+
+final class MatchGuard = Impl::MatchGuard;
diff --git a/rust/ql/lib/codeql/rust/elements/Meta.qll b/rust/ql/lib/codeql/rust/elements/Meta.qll
new file mode 100644
index 0000000000000..599857cdb6d32
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Meta.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Meta`.
+ */
+
+private import internal.MetaImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Path
+import codeql.rust.elements.TokenTree
+
+final class Meta = Impl::Meta;
diff --git a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
index 02a9c82b6d297..c463efc25cb12 100644
--- a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
@@ -4,13 +4,10 @@
  */
 
 private import internal.MethodCallExprImpl
+import codeql.rust.elements.ArgList
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
 
-/**
- * A method call expression. For example:
- * ```
- * x.foo(42);
- * x.foo::<u32, u64>(42);
- */
 final class MethodCallExpr = Impl::MethodCallExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/MissingExpr.qll b/rust/ql/lib/codeql/rust/elements/MissingExpr.qll
deleted file mode 100644
index 1d2b51f91e4da..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/MissingExpr.qll
+++ /dev/null
@@ -1,17 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `MissingExpr`.
- */
-
-private import internal.MissingExprImpl
-import codeql.rust.elements.Expr
-import codeql.rust.elements.Missing
-
-/**
- * A missing expression, used as a placeholder for incomplete syntax.
- *
- * ```
- * let x = non_existing_macro!();
- * ```
- */
-final class MissingExpr = Impl::MissingExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/MissingPat.qll b/rust/ql/lib/codeql/rust/elements/MissingPat.qll
deleted file mode 100644
index bddede6262e5a..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/MissingPat.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `MissingPat`.
- */
-
-private import internal.MissingPatImpl
-import codeql.rust.elements.Missing
-import codeql.rust.elements.Pat
-
-/**
- * A missing pattern, used as a place holder for incomplete syntax.
- * ```
- * match Some(42) {
- *     .. => "bad use of .. syntax",
- * };
- * ```
- */
-final class MissingPat = Impl::MissingPat;
diff --git a/rust/ql/lib/codeql/rust/elements/Module.qll b/rust/ql/lib/codeql/rust/elements/Module.qll
index 5e830f7bffb6a..49cad8828b75a 100644
--- a/rust/ql/lib/codeql/rust/elements/Module.qll
+++ b/rust/ql/lib/codeql/rust/elements/Module.qll
@@ -4,17 +4,10 @@
  */
 
 private import internal.ModuleImpl
-import codeql.rust.elements.Declaration
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+import codeql.rust.elements.ItemList
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
 
-/**
- * A module declaration. For example:
- * ```
- * mod foo;
- * ```
- * ```
- * mod bar {
- *     pub fn baz() {}
- * }
- * ```
- */
 final class Module = Impl::Module;
diff --git a/rust/ql/lib/codeql/rust/elements/Name.qll b/rust/ql/lib/codeql/rust/elements/Name.qll
new file mode 100644
index 0000000000000..c3fde9caf3e6b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Name.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Name`.
+ */
+
+private import internal.NameImpl
+import codeql.rust.elements.AstNode
+
+final class Name = Impl::Name;
diff --git a/rust/ql/lib/codeql/rust/elements/NameRef.qll b/rust/ql/lib/codeql/rust/elements/NameRef.qll
new file mode 100644
index 0000000000000..3a8d9a1312e77
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/NameRef.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `NameRef`.
+ */
+
+private import internal.NameRefImpl
+import codeql.rust.elements.AstNode
+
+final class NameRef = Impl::NameRef;
diff --git a/rust/ql/lib/codeql/rust/elements/NeverType.qll b/rust/ql/lib/codeql/rust/elements/NeverType.qll
new file mode 100644
index 0000000000000..8bbbaa90b466a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/NeverType.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `NeverType`.
+ */
+
+private import internal.NeverTypeImpl
+import codeql.rust.elements.Type
+
+final class NeverType = Impl::NeverType;
diff --git a/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll b/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
index 1a9fc00a95c97..0cf1d2560dcd1 100644
--- a/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
@@ -4,13 +4,9 @@
  */
 
 private import internal.OffsetOfExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.Type
 
-/**
- *  An `offset_of` expression. For example:
- * ```
- * builtin # offset_of(Struct, field);
- * ```
- */
 final class OffsetOfExpr = Impl::OffsetOfExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/OrPat.qll b/rust/ql/lib/codeql/rust/elements/OrPat.qll
index 82adfd4be851f..f423814315df5 100644
--- a/rust/ql/lib/codeql/rust/elements/OrPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/OrPat.qll
@@ -6,12 +6,4 @@
 private import internal.OrPatImpl
 import codeql.rust.elements.Pat
 
-/**
- * An or pattern. For example:
- * ```
- * match x {
- *     Option::Some(y) | Option::None => 0,
- * }
- * ```
- */
 final class OrPat = Impl::OrPat;
diff --git a/rust/ql/lib/codeql/rust/elements/Param.qll b/rust/ql/lib/codeql/rust/elements/Param.qll
new file mode 100644
index 0000000000000..a474b9fe9e59f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Param.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Param`.
+ */
+
+private import internal.ParamImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Pat
+import codeql.rust.elements.Type
+
+final class Param = Impl::Param;
diff --git a/rust/ql/lib/codeql/rust/elements/ParamList.qll b/rust/ql/lib/codeql/rust/elements/ParamList.qll
new file mode 100644
index 0000000000000..0b78046995b8a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ParamList.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ParamList`.
+ */
+
+private import internal.ParamListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Param
+import codeql.rust.elements.SelfParam
+
+final class ParamList = Impl::ParamList;
diff --git a/rust/ql/lib/codeql/rust/elements/ParenExpr.qll b/rust/ql/lib/codeql/rust/elements/ParenExpr.qll
new file mode 100644
index 0000000000000..229b6c9dafa3c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ParenExpr.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ParenExpr`.
+ */
+
+private import internal.ParenExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+
+final class ParenExpr = Impl::ParenExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ParenPat.qll b/rust/ql/lib/codeql/rust/elements/ParenPat.qll
new file mode 100644
index 0000000000000..98676814921e6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ParenPat.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ParenPat`.
+ */
+
+private import internal.ParenPatImpl
+import codeql.rust.elements.Pat
+
+final class ParenPat = Impl::ParenPat;
diff --git a/rust/ql/lib/codeql/rust/elements/ParenType.qll b/rust/ql/lib/codeql/rust/elements/ParenType.qll
new file mode 100644
index 0000000000000..f28c586a057f7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ParenType.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ParenType`.
+ */
+
+private import internal.ParenTypeImpl
+import codeql.rust.elements.Type
+
+final class ParenType = Impl::ParenType;
diff --git a/rust/ql/lib/codeql/rust/elements/Pat.qll b/rust/ql/lib/codeql/rust/elements/Pat.qll
index 7a0bf62c5c2c4..29ad7c9db16ea 100644
--- a/rust/ql/lib/codeql/rust/elements/Pat.qll
+++ b/rust/ql/lib/codeql/rust/elements/Pat.qll
@@ -6,7 +6,4 @@
 private import internal.PatImpl
 import codeql.rust.elements.AstNode
 
-/**
- * The base class for patterns.
- */
 final class Pat = Impl::Pat;
diff --git a/rust/ql/lib/codeql/rust/elements/Path.qll b/rust/ql/lib/codeql/rust/elements/Path.qll
index a0f62f5e03d4c..7d5b845efa2bf 100644
--- a/rust/ql/lib/codeql/rust/elements/Path.qll
+++ b/rust/ql/lib/codeql/rust/elements/Path.qll
@@ -5,12 +5,6 @@
 
 private import internal.PathImpl
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.Unimplemented
+import codeql.rust.elements.PathSegment
 
-/**
- * A path. For example:
- * ```
- * foo::bar;
- * ```
- */
 final class Path = Impl::Path;
diff --git a/rust/ql/lib/codeql/rust/elements/PathExpr.qll b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
index eb3a1ad031114..3155406c20e16 100644
--- a/rust/ql/lib/codeql/rust/elements/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
@@ -4,16 +4,8 @@
  */
 
 private import internal.PathExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Path
 
-/**
- * A path expression. For example:
- * ```
- * let x = variable;
- * let x = foo::bar;
- * let y = <T>::foo;
- * let z = <TypeRef as Trait>::foo;
- * ```
- */
 final class PathExpr = Impl::PathExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/PathPat.qll b/rust/ql/lib/codeql/rust/elements/PathPat.qll
index fc5a44ff9f583..5fc0f06f503eb 100644
--- a/rust/ql/lib/codeql/rust/elements/PathPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathPat.qll
@@ -7,13 +7,4 @@ private import internal.PathPatImpl
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Path
 
-/**
- * A path pattern. For example:
- * ```
- * match x {
- *     Foo::Bar => "ok",
- *     _ => "fail",
- * }
- * ```
- */
 final class PathPat = Impl::PathPat;
diff --git a/rust/ql/lib/codeql/rust/elements/PathSegment.qll b/rust/ql/lib/codeql/rust/elements/PathSegment.qll
new file mode 100644
index 0000000000000..589ad44f3ea8b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PathSegment.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PathSegment`.
+ */
+
+private import internal.PathSegmentImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.PathType
+import codeql.rust.elements.RetType
+import codeql.rust.elements.ReturnTypeSyntax
+import codeql.rust.elements.Type
+
+final class PathSegment = Impl::PathSegment;
diff --git a/rust/ql/lib/codeql/rust/elements/PathType.qll b/rust/ql/lib/codeql/rust/elements/PathType.qll
new file mode 100644
index 0000000000000..f11164468bc3a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PathType.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PathType`.
+ */
+
+private import internal.PathTypeImpl
+import codeql.rust.elements.Path
+import codeql.rust.elements.Type
+
+final class PathType = Impl::PathType;
diff --git a/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll b/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll
index 6a2228a54dffe..e07a0b021fdeb 100644
--- a/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/PrefixExpr.qll
@@ -4,14 +4,7 @@
  */
 
 private import internal.PrefixExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * A unary operation expression. For example:
- * ```
- * let x = -42
- * let y = !true
- * let z = *ptr
- * ```
- */
 final class PrefixExpr = Impl::PrefixExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/PtrType.qll b/rust/ql/lib/codeql/rust/elements/PtrType.qll
new file mode 100644
index 0000000000000..34a5bfd5e18f7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PtrType.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PtrType`.
+ */
+
+private import internal.PtrTypeImpl
+import codeql.rust.elements.Type
+
+final class PtrType = Impl::PtrType;
diff --git a/rust/ql/lib/codeql/rust/elements/RangeExpr.qll b/rust/ql/lib/codeql/rust/elements/RangeExpr.qll
index f66756fee25bd..e5fb58a664018 100644
--- a/rust/ql/lib/codeql/rust/elements/RangeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/RangeExpr.qll
@@ -4,17 +4,7 @@
  */
 
 private import internal.RangeExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * A range expression. For example:
- * ```
- * let x = 1..=10;
- * let x = 1..10;
- * let x = 10..;
- * let x = ..10;
- * let x = ..=10;
- * let x = ..;
- * ```
- */
 final class RangeExpr = Impl::RangeExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/RangePat.qll b/rust/ql/lib/codeql/rust/elements/RangePat.qll
index c392527da2571..38f6eba9db0f1 100644
--- a/rust/ql/lib/codeql/rust/elements/RangePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/RangePat.qll
@@ -6,14 +6,4 @@
 private import internal.RangePatImpl
 import codeql.rust.elements.Pat
 
-/**
- * A range pattern. For example:
- * ```
- * match x {
- *     ..15 => "too cold",
- *     16..=25 => "just right",
- *     26.. => "too hot",
- * }
- * ```
- */
 final class RangePat = Impl::RangePat;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordExpr.qll b/rust/ql/lib/codeql/rust/elements/RecordExpr.qll
index 0795b279e55d7..61610375f767c 100644
--- a/rust/ql/lib/codeql/rust/elements/RecordExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordExpr.qll
@@ -6,15 +6,6 @@
 private import internal.RecordExprImpl
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Path
-import codeql.rust.elements.RecordExprField
+import codeql.rust.elements.RecordExprFieldList
 
-/**
- * A record expression. For example:
- * ```
- * let first = Foo { a: 1, b: 2 };
- * let second = Foo { a: 2, ..first };
- * Foo { a: 1, b: 2 }[2] = 10;
- * Foo { .. } = second;
- * ```
- */
 final class RecordExpr = Impl::RecordExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordExprField.qll b/rust/ql/lib/codeql/rust/elements/RecordExprField.qll
index 08d091f10dfa0..49ecea53cc42a 100644
--- a/rust/ql/lib/codeql/rust/elements/RecordExprField.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordExprField.qll
@@ -5,12 +5,8 @@
 
 private import internal.RecordExprFieldImpl
 import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.NameRef
 
-/**
- * A field in a record expression. For example `a: 1` in:
- * ```
- * Foo { a: 1, b: 2 };
- * ```
- */
 final class RecordExprField = Impl::RecordExprField;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordExprFieldList.qll b/rust/ql/lib/codeql/rust/elements/RecordExprFieldList.qll
new file mode 100644
index 0000000000000..0a482665df085
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RecordExprFieldList.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RecordExprFieldList`.
+ */
+
+private import internal.RecordExprFieldListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.RecordExprField
+
+final class RecordExprFieldList = Impl::RecordExprFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordField.qll b/rust/ql/lib/codeql/rust/elements/RecordField.qll
new file mode 100644
index 0000000000000..5e0d761761013
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RecordField.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RecordField`.
+ */
+
+private import internal.RecordFieldImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+import codeql.rust.elements.Visibility
+
+final class RecordField = Impl::RecordField;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordFieldList.qll b/rust/ql/lib/codeql/rust/elements/RecordFieldList.qll
new file mode 100644
index 0000000000000..526066c4196b8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RecordFieldList.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RecordFieldList`.
+ */
+
+private import internal.RecordFieldListImpl
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.RecordField
+
+final class RecordFieldList = Impl::RecordFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordPat.qll b/rust/ql/lib/codeql/rust/elements/RecordPat.qll
index 23ce72a622f0d..27133bae3d3dc 100644
--- a/rust/ql/lib/codeql/rust/elements/RecordPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordPat.qll
@@ -6,15 +6,6 @@
 private import internal.RecordPatImpl
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Path
-import codeql.rust.elements.RecordPatField
+import codeql.rust.elements.RecordPatFieldList
 
-/**
- * A record pattern. For example:
- * ```
- * match x {
- *     Foo { a: 1, b: 2 } => "ok",
- *     Foo { .. } => "fail",
- * }
- * ```
- */
 final class RecordPat = Impl::RecordPat;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordPatField.qll b/rust/ql/lib/codeql/rust/elements/RecordPatField.qll
index 53af19928cb4d..c27d0365c7ffc 100644
--- a/rust/ql/lib/codeql/rust/elements/RecordPatField.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordPatField.qll
@@ -5,12 +5,8 @@
 
 private import internal.RecordPatFieldImpl
 import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.NameRef
 import codeql.rust.elements.Pat
 
-/**
- * A field in a record pattern. For example `a: 1` in:
- * ```
- * let Foo { a: 1, b: 2 } = foo;
- * ```
- */
 final class RecordPatField = Impl::RecordPatField;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordPatFieldList.qll b/rust/ql/lib/codeql/rust/elements/RecordPatFieldList.qll
new file mode 100644
index 0000000000000..c4bd56fb69e1d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RecordPatFieldList.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RecordPatFieldList`.
+ */
+
+private import internal.RecordPatFieldListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.RecordPatField
+import codeql.rust.elements.RestPat
+
+final class RecordPatFieldList = Impl::RecordPatFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/RefExpr.qll b/rust/ql/lib/codeql/rust/elements/RefExpr.qll
index 59682959aff8a..018fee69b2f1f 100644
--- a/rust/ql/lib/codeql/rust/elements/RefExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/RefExpr.qll
@@ -4,15 +4,7 @@
  */
 
 private import internal.RefExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * A reference expression. For example:
- * ```
- *     let ref_const = &foo;
- *     let ref_mut = &mut foo;
- *     let raw_const: &mut i32 = &raw const foo;
- *     let raw_mut: &mut i32 = &raw mut foo;
- * ```
- */
 final class RefExpr = Impl::RefExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/RefPat.qll b/rust/ql/lib/codeql/rust/elements/RefPat.qll
index 15c52559939a8..8158f303d5801 100644
--- a/rust/ql/lib/codeql/rust/elements/RefPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/RefPat.qll
@@ -6,13 +6,4 @@
 private import internal.RefPatImpl
 import codeql.rust.elements.Pat
 
-/**
- * A reference pattern. For example:
- * ```
- * match x {
- *     &mut Option::Some(y) => y,
- *     &Option::None => 0,
- * };
- * ```
- */
 final class RefPat = Impl::RefPat;
diff --git a/rust/ql/lib/codeql/rust/elements/RefType.qll b/rust/ql/lib/codeql/rust/elements/RefType.qll
new file mode 100644
index 0000000000000..54f083f3830cf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RefType.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RefType`.
+ */
+
+private import internal.RefTypeImpl
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.Type
+
+final class RefType = Impl::RefType;
diff --git a/rust/ql/lib/codeql/rust/elements/Rename.qll b/rust/ql/lib/codeql/rust/elements/Rename.qll
new file mode 100644
index 0000000000000..fbb799c711b2c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Rename.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Rename`.
+ */
+
+private import internal.RenameImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Name
+
+final class Rename = Impl::Rename;
diff --git a/rust/ql/lib/codeql/rust/elements/RepeatExpr.qll b/rust/ql/lib/codeql/rust/elements/RepeatExpr.qll
deleted file mode 100644
index c623074e47726..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/RepeatExpr.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RepeatExpr`.
- */
-
-private import internal.RepeatExprImpl
-import codeql.rust.elements.ArrayExpr
-import codeql.rust.elements.Expr
-
-/**
- * A repeat expression. For example:
- * ```
- * [1; 10];
- */
-final class RepeatExpr = Impl::RepeatExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/RestPat.qll b/rust/ql/lib/codeql/rust/elements/RestPat.qll
new file mode 100644
index 0000000000000..405127cb9a65e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RestPat.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RestPat`.
+ */
+
+private import internal.RestPatImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Pat
+
+final class RestPat = Impl::RestPat;
diff --git a/rust/ql/lib/codeql/rust/elements/RetType.qll b/rust/ql/lib/codeql/rust/elements/RetType.qll
new file mode 100644
index 0000000000000..7c67cf41d3081
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RetType.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RetType`.
+ */
+
+private import internal.RetTypeImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Type
+
+final class RetType = Impl::RetType;
diff --git a/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll b/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll
index 4906cd8402ea1..5a60d34f984a7 100644
--- a/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ReturnExpr.qll
@@ -4,19 +4,7 @@
  */
 
 private import internal.ReturnExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * A return expression. For example:
- * ```
- * fn some_value() -> i32 {
- *     return 42;
- * }
- * ```
- * ```
- * fn no_value() -> () {
- *     return;
- * }
- * ```
- */
 final class ReturnExpr = Impl::ReturnExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ReturnTypeSyntax.qll b/rust/ql/lib/codeql/rust/elements/ReturnTypeSyntax.qll
new file mode 100644
index 0000000000000..f903b30f199f3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ReturnTypeSyntax.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ReturnTypeSyntax`.
+ */
+
+private import internal.ReturnTypeSyntaxImpl
+import codeql.rust.elements.AstNode
+
+final class ReturnTypeSyntax = Impl::ReturnTypeSyntax;
diff --git a/rust/ql/lib/codeql/rust/elements/SelfParam.qll b/rust/ql/lib/codeql/rust/elements/SelfParam.qll
new file mode 100644
index 0000000000000..15c76dd9f7990
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/SelfParam.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `SelfParam`.
+ */
+
+private import internal.SelfParamImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+
+final class SelfParam = Impl::SelfParam;
diff --git a/rust/ql/lib/codeql/rust/elements/SlicePat.qll b/rust/ql/lib/codeql/rust/elements/SlicePat.qll
index 0bb77f448a974..0f903cdf60b6e 100644
--- a/rust/ql/lib/codeql/rust/elements/SlicePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/SlicePat.qll
@@ -6,13 +6,4 @@
 private import internal.SlicePatImpl
 import codeql.rust.elements.Pat
 
-/**
- * A slice pattern. For example:
- * ```
- * match x {
- *     [1, 2, 3, 4, 5] => "ok",
- *     [1, 2, ..] => "fail",
- *     [x, y, .., z, 7] => "fail",
- * }
- */
 final class SlicePat = Impl::SlicePat;
diff --git a/rust/ql/lib/codeql/rust/elements/SliceType.qll b/rust/ql/lib/codeql/rust/elements/SliceType.qll
new file mode 100644
index 0000000000000..61f1cf12009da
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/SliceType.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `SliceType`.
+ */
+
+private import internal.SliceTypeImpl
+import codeql.rust.elements.Type
+
+final class SliceType = Impl::SliceType;
diff --git a/rust/ql/lib/codeql/rust/elements/SourceFile.qll b/rust/ql/lib/codeql/rust/elements/SourceFile.qll
new file mode 100644
index 0000000000000..90dae7feee6b8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/SourceFile.qll
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `SourceFile`.
+ */
+
+private import internal.SourceFileImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+
+final class SourceFile = Impl::SourceFile;
diff --git a/rust/ql/lib/codeql/rust/elements/Static.qll b/rust/ql/lib/codeql/rust/elements/Static.qll
new file mode 100644
index 0000000000000..df28c9dc0ff80
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Static.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Static`.
+ */
+
+private import internal.StaticImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.ExternItem
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+import codeql.rust.elements.Visibility
+
+final class Static = Impl::Static;
diff --git a/rust/ql/lib/codeql/rust/elements/Stmt.qll b/rust/ql/lib/codeql/rust/elements/Stmt.qll
index 7da272f973d9a..8dcbbc87ac642 100644
--- a/rust/ql/lib/codeql/rust/elements/Stmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/Stmt.qll
@@ -6,7 +6,4 @@
 private import internal.StmtImpl
 import codeql.rust.elements.AstNode
 
-/**
- * The base class for statements.
- */
 final class Stmt = Impl::Stmt;
diff --git a/rust/ql/lib/codeql/rust/elements/StmtList.qll b/rust/ql/lib/codeql/rust/elements/StmtList.qll
new file mode 100644
index 0000000000000..3b106b9417f32
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/StmtList.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `StmtList`.
+ */
+
+private import internal.StmtListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Stmt
+
+final class StmtList = Impl::StmtList;
diff --git a/rust/ql/lib/codeql/rust/elements/Struct.qll b/rust/ql/lib/codeql/rust/elements/Struct.qll
new file mode 100644
index 0000000000000..99928426d6ddd
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Struct.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Struct`.
+ */
+
+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.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+final class Struct = Impl::Struct;
diff --git a/rust/ql/lib/codeql/rust/elements/TokenTree.qll b/rust/ql/lib/codeql/rust/elements/TokenTree.qll
new file mode 100644
index 0000000000000..a8f13d07de410
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TokenTree.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TokenTree`.
+ */
+
+private import internal.TokenTreeImpl
+import codeql.rust.elements.AstNode
+
+final class TokenTree = Impl::TokenTree;
diff --git a/rust/ql/lib/codeql/rust/elements/Trait.qll b/rust/ql/lib/codeql/rust/elements/Trait.qll
new file mode 100644
index 0000000000000..f7cd5e2f7732d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Trait.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Trait`.
+ */
+
+private import internal.TraitImpl
+import codeql.rust.elements.AssocItemList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+final class Trait = Impl::Trait;
diff --git a/rust/ql/lib/codeql/rust/elements/TraitAlias.qll b/rust/ql/lib/codeql/rust/elements/TraitAlias.qll
new file mode 100644
index 0000000000000..ea2da753087b6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TraitAlias.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TraitAlias`.
+ */
+
+private import internal.TraitAliasImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+final class TraitAlias = Impl::TraitAlias;
diff --git a/rust/ql/lib/codeql/rust/elements/TryExpr.qll b/rust/ql/lib/codeql/rust/elements/TryExpr.qll
new file mode 100644
index 0000000000000..a2e9bed204281
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TryExpr.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TryExpr`.
+ */
+
+private import internal.TryExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+
+final class TryExpr = Impl::TryExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleExpr.qll b/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
index 37be7e8cf03e7..0ae043b70332c 100644
--- a/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
@@ -4,13 +4,7 @@
  */
 
 private import internal.TupleExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * A tuple expression. For example:
- * ```
- * (1, "one");
- * (2, "two")[0] = 3;
- * ```
- */
 final class TupleExpr = Impl::TupleExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleField.qll b/rust/ql/lib/codeql/rust/elements/TupleField.qll
new file mode 100644
index 0000000000000..5787e1cf1af25
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TupleField.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TupleField`.
+ */
+
+private import internal.TupleFieldImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Type
+import codeql.rust.elements.Visibility
+
+final class TupleField = Impl::TupleField;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleFieldList.qll b/rust/ql/lib/codeql/rust/elements/TupleFieldList.qll
new file mode 100644
index 0000000000000..36575f3dfe51d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TupleFieldList.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TupleFieldList`.
+ */
+
+private import internal.TupleFieldListImpl
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.TupleField
+
+final class TupleFieldList = Impl::TupleFieldList;
diff --git a/rust/ql/lib/codeql/rust/elements/TuplePat.qll b/rust/ql/lib/codeql/rust/elements/TuplePat.qll
index 1b792e649ec8c..e017f607a97af 100644
--- a/rust/ql/lib/codeql/rust/elements/TuplePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/TuplePat.qll
@@ -6,11 +6,4 @@
 private import internal.TuplePatImpl
 import codeql.rust.elements.Pat
 
-/**
- * A tuple pattern. For example:
- * ```
- * let (x, y) = (1, 2);
- * let (a, b, ..,  z) = (1, 2, 3, 4, 5);
- * ```
- */
 final class TuplePat = Impl::TuplePat;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleStructPat.qll b/rust/ql/lib/codeql/rust/elements/TupleStructPat.qll
index fd2a54a9bcdfb..d7be3ead7809f 100644
--- a/rust/ql/lib/codeql/rust/elements/TupleStructPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/TupleStructPat.qll
@@ -7,14 +7,4 @@ private import internal.TupleStructPatImpl
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Path
 
-/**
- * A tuple struct pattern. For example:
- * ```
- * match x {
- *     Tuple("a", 1, 2, 3) => "great",
- *     Tuple(.., 3) => "fine",
- *     Tuple(..) => "fail",
- * };
- * ```
- */
 final class TupleStructPat = Impl::TupleStructPat;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleType.qll b/rust/ql/lib/codeql/rust/elements/TupleType.qll
new file mode 100644
index 0000000000000..c1dc21dc36be3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TupleType.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TupleType`.
+ */
+
+private import internal.TupleTypeImpl
+import codeql.rust.elements.Type
+
+final class TupleType = Impl::TupleType;
diff --git a/rust/ql/lib/codeql/rust/elements/Type.qll b/rust/ql/lib/codeql/rust/elements/Type.qll
new file mode 100644
index 0000000000000..70dcac17ff6d7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Type.qll
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Type`.
+ */
+
+private import internal.TypeImpl
+import codeql.rust.elements.AstNode
+
+final class Type = Impl::Type;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
new file mode 100644
index 0000000000000..4be1cf1300a3b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TypeAlias`.
+ */
+
+private import internal.TypeAliasImpl
+import codeql.rust.elements.AssocItem
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItem
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+final class TypeAlias = Impl::TypeAlias;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeArg.qll b/rust/ql/lib/codeql/rust/elements/TypeArg.qll
new file mode 100644
index 0000000000000..f863da9dab8fb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TypeArg.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TypeArg`.
+ */
+
+private import internal.TypeArgImpl
+import codeql.rust.elements.GenericArg
+import codeql.rust.elements.Type
+
+final class TypeArg = Impl::TypeArg;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
new file mode 100644
index 0000000000000..d1c804dff395d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TypeBound`.
+ */
+
+private import internal.TypeBoundImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.Type
+
+final class TypeBound = Impl::TypeBound;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeBoundList.qll b/rust/ql/lib/codeql/rust/elements/TypeBoundList.qll
new file mode 100644
index 0000000000000..9c6d7f6a5d972
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TypeBoundList.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TypeBoundList`.
+ */
+
+private import internal.TypeBoundListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.TypeBound
+
+final class TypeBoundList = Impl::TypeBoundList;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeParam.qll b/rust/ql/lib/codeql/rust/elements/TypeParam.qll
new file mode 100644
index 0000000000000..438b76726ac9f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TypeParam.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TypeParam`.
+ */
+
+private import internal.TypeParamImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParam
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+import codeql.rust.elements.TypeBoundList
+
+final class TypeParam = Impl::TypeParam;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeRef.qll b/rust/ql/lib/codeql/rust/elements/TypeRef.qll
deleted file mode 100644
index 87e12342ef8ab..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/TypeRef.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `TypeRef`.
- */
-
-private import internal.TypeRefImpl
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.Unimplemented
-
-/**
- * The base class for type references.
- * ```
- * let x: i32;
- * let y: Vec<i32>;
- * let z: Option<i32>;
- * ```
- */
-final class TypeRef = Impl::TypeRef;
diff --git a/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll b/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll
index 6301c56ee4e0a..583bc802698a3 100644
--- a/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/UnderscoreExpr.qll
@@ -4,12 +4,7 @@
  */
 
 private import internal.UnderscoreExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * An underscore expression. For example:
- * ```
- * _ = 42;
- * ```
- */
 final class UnderscoreExpr = Impl::UnderscoreExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/UnimplementedDeclaration.qll b/rust/ql/lib/codeql/rust/elements/UnimplementedDeclaration.qll
deleted file mode 100644
index 479ed740e3ee6..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/UnimplementedDeclaration.qll
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `UnimplementedDeclaration`.
- */
-
-private import internal.UnimplementedDeclarationImpl
-import codeql.rust.elements.Declaration
-import codeql.rust.elements.Unimplemented
-
-/**
- * A declaration that is not yet extracted.
- */
-final class UnimplementedDeclaration = Impl::UnimplementedDeclaration;
diff --git a/rust/ql/lib/codeql/rust/elements/Union.qll b/rust/ql/lib/codeql/rust/elements/Union.qll
new file mode 100644
index 0000000000000..15112de95ea03
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Union.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Union`.
+ */
+
+private import internal.UnionImpl
+import codeql.rust.elements.Adt
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Item
+import codeql.rust.elements.Name
+import codeql.rust.elements.RecordFieldList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+final class Union = Impl::Union;
diff --git a/rust/ql/lib/codeql/rust/elements/UnsafeBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/UnsafeBlockExpr.qll
deleted file mode 100644
index c9e079e5129bf..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/UnsafeBlockExpr.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `UnsafeBlockExpr`.
- */
-
-private import internal.UnsafeBlockExprImpl
-import codeql.rust.elements.BlockExprBase
-
-/**
- * An unsafe block expression. For example:
- * ```
- * let layout = unsafe {
- *     let x = 42;
- *     Layout::from_size_align_unchecked(size, align)
- * };
- * ```
- */
-final class UnsafeBlockExpr = Impl::UnsafeBlockExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/Use.qll b/rust/ql/lib/codeql/rust/elements/Use.qll
new file mode 100644
index 0000000000000..5dfb3009ac874
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Use.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Use`.
+ */
+
+private import internal.UseImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+import codeql.rust.elements.UseTree
+import codeql.rust.elements.Visibility
+
+final class Use = Impl::Use;
diff --git a/rust/ql/lib/codeql/rust/elements/UseTree.qll b/rust/ql/lib/codeql/rust/elements/UseTree.qll
new file mode 100644
index 0000000000000..6ca982e73a85f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/UseTree.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `UseTree`.
+ */
+
+private import internal.UseTreeImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Path
+import codeql.rust.elements.Rename
+import codeql.rust.elements.UseTreeList
+
+final class UseTree = Impl::UseTree;
diff --git a/rust/ql/lib/codeql/rust/elements/UseTreeList.qll b/rust/ql/lib/codeql/rust/elements/UseTreeList.qll
new file mode 100644
index 0000000000000..455bd7c3742c6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/UseTreeList.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `UseTreeList`.
+ */
+
+private import internal.UseTreeListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.UseTree
+
+final class UseTreeList = Impl::UseTreeList;
diff --git a/rust/ql/lib/codeql/rust/elements/Variant.qll b/rust/ql/lib/codeql/rust/elements/Variant.qll
new file mode 100644
index 0000000000000..2968155bc7984
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Variant.qll
@@ -0,0 +1,14 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Variant`.
+ */
+
+private import internal.VariantImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
+
+final class Variant = Impl::Variant;
diff --git a/rust/ql/lib/codeql/rust/elements/VariantList.qll b/rust/ql/lib/codeql/rust/elements/VariantList.qll
new file mode 100644
index 0000000000000..502f3eadddd2f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/VariantList.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `VariantList`.
+ */
+
+private import internal.VariantListImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Variant
+
+final class VariantList = Impl::VariantList;
diff --git a/rust/ql/lib/codeql/rust/elements/Visibility.qll b/rust/ql/lib/codeql/rust/elements/Visibility.qll
new file mode 100644
index 0000000000000..32b161da10c6a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Visibility.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Visibility`.
+ */
+
+private import internal.VisibilityImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Path
+
+final class Visibility = Impl::Visibility;
diff --git a/rust/ql/lib/codeql/rust/elements/WhereClause.qll b/rust/ql/lib/codeql/rust/elements/WhereClause.qll
new file mode 100644
index 0000000000000..f79c1fe0ae2e4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/WhereClause.qll
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `WhereClause`.
+ */
+
+private import internal.WhereClauseImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.WherePred
+
+final class WhereClause = Impl::WhereClause;
diff --git a/rust/ql/lib/codeql/rust/elements/WherePred.qll b/rust/ql/lib/codeql/rust/elements/WherePred.qll
new file mode 100644
index 0000000000000..076b6d7f67186
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/WherePred.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `WherePred`.
+ */
+
+private import internal.WherePredImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.Type
+import codeql.rust.elements.TypeBoundList
+
+final class WherePred = Impl::WherePred;
diff --git a/rust/ql/lib/codeql/rust/elements/WhileExpr.qll b/rust/ql/lib/codeql/rust/elements/WhileExpr.qll
new file mode 100644
index 0000000000000..b5a92625379eb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/WhileExpr.qll
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `WhileExpr`.
+ */
+
+private import internal.WhileExprImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Label
+
+final class WhileExpr = Impl::WhileExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/WildcardPat.qll b/rust/ql/lib/codeql/rust/elements/WildcardPat.qll
index c43118eedc904..961f34a984d48 100644
--- a/rust/ql/lib/codeql/rust/elements/WildcardPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/WildcardPat.qll
@@ -6,10 +6,4 @@
 private import internal.WildcardPatImpl
 import codeql.rust.elements.Pat
 
-/**
- * A wildcard pattern. For example:
- * ```
- * let _ = 42;
- * ```
- */
 final class WildcardPat = Impl::WildcardPat;
diff --git a/rust/ql/lib/codeql/rust/elements/YeetExpr.qll b/rust/ql/lib/codeql/rust/elements/YeetExpr.qll
index 7e6a62b18c638..3966abb61686d 100644
--- a/rust/ql/lib/codeql/rust/elements/YeetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/YeetExpr.qll
@@ -4,14 +4,7 @@
  */
 
 private import internal.YeetExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * A `yeet` expression. For example:
- * ```
- * if x < size {
- *    do yeet "index out of bounds";
- * }
- * ```
- */
 final class YeetExpr = Impl::YeetExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/YieldExpr.qll b/rust/ql/lib/codeql/rust/elements/YieldExpr.qll
index f4625f8c389d7..962fed243d165 100644
--- a/rust/ql/lib/codeql/rust/elements/YieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/YieldExpr.qll
@@ -4,15 +4,7 @@
  */
 
 private import internal.YieldExprImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
-/**
- * A `yield` expression. For example:
- * ```
- * let one = #[coroutine]
- *     || {
- *         yield 1;
- *     };
- * ```
- */
 final class YieldExpr = Impl::YieldExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AbiConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/AbiConstructor.qll
new file mode 100644
index 0000000000000..2c6161a465788
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AbiConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Abi` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Abi` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructAbi(Raw::Abi id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AbiImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AbiImpl.qll
new file mode 100644
index 0000000000000..96b0614e92024
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AbiImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Abi`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Abi
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Abi` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Abi extends Generated::Abi { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AdtImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AdtImpl.qll
new file mode 100644
index 0000000000000..2b024a9b0b95b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AdtImpl.qll
@@ -0,0 +1,16 @@
+// 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`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Adt
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Adt` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Adt extends Generated::Adt { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArgListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ArgListConstructor.qll
new file mode 100644
index 0000000000000..daafc9ba2d2aa
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArgListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ArgList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ArgList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructArgList(Raw::ArgList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArgListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArgListImpl.qll
new file mode 100644
index 0000000000000..e4a5453ae6d33
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArgListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ArgList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ArgList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ArgList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ArgList extends Generated::ArgList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprConstructor.qll
new file mode 100644
index 0000000000000..bd4a8362cc542
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ArrayExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ArrayExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructArrayExpr(Raw::ArrayExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll
index 10a8fe342f662..7f8f5cc6a511b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll
@@ -12,12 +12,5 @@ private import codeql.rust.elements.internal.generated.ArrayExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * An array expression. For example:
-   * ```
-   * [1, 2, 3];
-   * [1; 10];
-   * ```
-   */
   class ArrayExpr extends Generated::ArrayExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll
new file mode 100644
index 0000000000000..8a4ea671b28f3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ArrayType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ArrayType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructArrayType(Raw::ArrayType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll
new file mode 100644
index 0000000000000..9f9dbd3ee5381
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ArrayType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ArrayType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ArrayType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ArrayType extends Generated::ArrayType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AsmExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AsmExprImpl.qll
index 729851697c8e5..de46e3bf1135b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AsmExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AsmExprImpl.qll
@@ -12,13 +12,5 @@ private import codeql.rust.elements.internal.generated.AsmExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * An inline assembly expression. For example:
-   * ```
-   * unsafe {
-   *     builtin # asm(_);
-   * }
-   * ```
-   */
   class AsmExpr extends Generated::AsmExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AssocItemImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AssocItemImpl.qll
new file mode 100644
index 0000000000000..c6fe870c4c339
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AssocItemImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `AssocItem`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.AssocItem
+
+/**
+ * INTERNAL: This module contains the customizable definition of `AssocItem` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class AssocItem extends Generated::AssocItem { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AssocItemListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/AssocItemListConstructor.qll
new file mode 100644
index 0000000000000..c8d2780e81d07
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AssocItemListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `AssocItemList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `AssocItemList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructAssocItemList(Raw::AssocItemList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AssocItemListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AssocItemListImpl.qll
new file mode 100644
index 0000000000000..fe80fb9718e61
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AssocItemListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `AssocItemList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.AssocItemList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `AssocItemList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class AssocItemList extends Generated::AssocItemList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgConstructor.qll
new file mode 100644
index 0000000000000..45e1b1baece40
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `AssocTypeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `AssocTypeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructAssocTypeArg(Raw::AssocTypeArg id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgImpl.qll
new file mode 100644
index 0000000000000..c9e460369ed23
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AssocTypeArgImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `AssocTypeArg`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.AssocTypeArg
+
+/**
+ * INTERNAL: This module contains the customizable definition of `AssocTypeArg` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class AssocTypeArg extends Generated::AssocTypeArg { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprConstructor.qll
deleted file mode 100644
index 88ef97a1f079a..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `AsyncBlockExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `AsyncBlockExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructAsyncBlockExpr(Raw::AsyncBlockExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprImpl.qll
deleted file mode 100644
index 7f99010c32328..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/AsyncBlockExprImpl.qll
+++ /dev/null
@@ -1,25 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `AsyncBlockExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.AsyncBlockExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `AsyncBlockExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * An async block expression. For example:
-   * ```
-   * async {
-   *    let x = 42;
-   *    x
-   * }.await
-   * ```
-   */
-  class AsyncBlockExpr extends Generated::AsyncBlockExpr { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AttrConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/AttrConstructor.qll
new file mode 100644
index 0000000000000..ab7c223854ddb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AttrConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Attr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Attr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructAttr(Raw::Attr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AttrImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AttrImpl.qll
new file mode 100644
index 0000000000000..b8322ce402e6a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AttrImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Attr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Attr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Attr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Attr extends Generated::Attr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
index 6a95eda812a20..8d7cb1b429738 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.AwaitExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * An `await` expression. For example:
-   * ```
-   * async {
-   *     let x = foo().await;
-   *     x
-   * }
-   * ```
-   */
   class AwaitExpr extends Generated::AwaitExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll
index aaeee2e2e493c..d4589b9097cab 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll
@@ -12,16 +12,5 @@ private import codeql.rust.elements.internal.generated.BecomeExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A `become` expression. For example:
-   * ```
-   * fn fact_a(n: i32, a: i32) -> i32 {
-   *      if n == 0 {
-   *          a
-   *      } else {
-   *          become fact_a(n - 1, n * a)
-   *      }
-   *  }    ```
-   */
   class BecomeExpr extends Generated::BecomeExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
index f0aaeaaf611d4..9742f4179d418 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BinaryExprImpl.qll
@@ -12,15 +12,5 @@ private import codeql.rust.elements.internal.generated.BinaryExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A binary operation expression. For example:
-   * ```
-   * x + y;
-   * x && y;
-   * x <= y;
-   * x = y;
-   * x += y;
-   * ```
-   */
   class BinaryExpr extends Generated::BinaryExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BlockExprBaseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BlockExprBaseImpl.qll
deleted file mode 100644
index 20e34111684b4..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/BlockExprBaseImpl.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `BlockExprBase`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.BlockExprBase
-
-/**
- * INTERNAL: This module contains the customizable definition of `BlockExprBase` and should not
- * be referenced directly.
- */
-module Impl {
-  class BlockExprBase extends Generated::BlockExprBase { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BlockExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BlockExprImpl.qll
index 25ae0064f6042..36425a6ed89a8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BlockExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BlockExprImpl.qll
@@ -12,19 +12,5 @@ private import codeql.rust.elements.internal.generated.BlockExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A block expression. For example:
-   * ```
-   * {
-   *     let x = 42;
-   * }
-   * ```
-   * ```
-   * 'label: {
-   *     let x = 42;
-   *     x
-   * }
-   * ```
-   */
   class BlockExpr extends Generated::BlockExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BoxExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/BoxExprConstructor.qll
deleted file mode 100644
index cd9afed99a935..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/BoxExprConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `BoxExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `BoxExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructBoxExpr(Raw::BoxExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BoxExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BoxExprImpl.qll
deleted file mode 100644
index fa85c53f47143..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/BoxExprImpl.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `BoxExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.BoxExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `BoxExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A box expression. For example:
-   * ```
-   * let x = #[rustc_box] Box::new(42);
-   * ```
-   */
-  class BoxExpr extends Generated::BoxExpr { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
index 7d9a5bd5c1589..fd757bedc4537 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.BoxPat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A box pattern. For example:
-   * ```
-   * match x {
-   *     box Option::Some(y) => y,
-   *     box Option::None => 0,
-   * };
-   * ```
-   */
   class BoxPat extends Generated::BoxPat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
index c6b464050d52d..0315687e50ce3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
@@ -12,22 +12,5 @@ private import codeql.rust.elements.internal.generated.BreakExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A break expression. For example:
-   * ```
-   * loop {
-   *     if not_ready() {
-   *         break;
-   *      }
-   * }
-   * ```
-   * ```
-   * let x = 'label: loop {
-   *     if done() {
-   *         break 'label 42;
-   *     }
-   * };
-   * ```
-   */
   class BreakExpr extends Generated::BreakExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
index e08565cb74ade..84a7c91262faa 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.CallExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A function call expression. For example:
-   * ```
-   * foo(42);
-   * foo::<u32, u64>(42);
-   * foo[0](42);
-   * foo(1) = 4;
-   * ```
-   */
   class CallExpr extends Generated::CallExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
index e48b8ba7a48a3..e713e7d671fce 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
@@ -12,11 +12,5 @@ private import codeql.rust.elements.internal.generated.CastExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A cast expression. For example:
-   * ```
-   * value as u64;
-   * ```
-   */
   class CastExpr extends Generated::CastExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll
new file mode 100644
index 0000000000000..0213547728fd2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ClosureBinder` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ClosureBinder` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructClosureBinder(Raw::ClosureBinder id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll
new file mode 100644
index 0000000000000..62393ea90ae85
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ClosureBinder`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ClosureBinder
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ClosureBinder` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ClosureBinder extends Generated::ClosureBinder { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
index 7715b70256455..604dfbf3bfb17 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
@@ -12,17 +12,5 @@ private import codeql.rust.elements.internal.generated.ClosureExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A closure expression. For example:
-   * ```
-   * |x| x + 1;
-   * move |x: i32| -> i32 { x + 1 };
-   * async |x: i32, y| x + y;
-   *  #[coroutine]
-   * |x| yield x;
-   *  #[coroutine]
-   *  static |x| yield x;
-   * ```
-   */
   class ClosureExpr extends Generated::ClosureExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstArgConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstArgConstructor.qll
new file mode 100644
index 0000000000000..c166c419f6c11
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstArgConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ConstArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ConstArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructConstArg(Raw::ConstArg id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstArgImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstArgImpl.qll
new file mode 100644
index 0000000000000..1bbad2608d8ae
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstArgImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ConstArg`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ConstArg
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ConstArg` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ConstArg extends Generated::ConstArg { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstBlockPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstBlockPatImpl.qll
index 04760673d2b61..533ca97f26a4e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ConstBlockPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstBlockPatImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.ConstBlockPat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A const block pattern. For example:
-   * ```
-   * match x {
-   *     const { 1 + 2 + 3 } => "ok",
-   *     _ => "fail",
-   * };
-   * ```
-   */
   class ConstBlockPat extends Generated::ConstBlockPat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstConstructor.qll
new file mode 100644
index 0000000000000..6e60ea8a6f458
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Const` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Const` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructConst(Raw::Const id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstExprConstructor.qll
deleted file mode 100644
index 69accf79690d1..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ConstExprConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ConstExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `ConstExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructConstExpr(Raw::ConstExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstExprImpl.qll
deleted file mode 100644
index 297e7449acea2..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ConstExprImpl.qll
+++ /dev/null
@@ -1,24 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `ConstExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.ConstExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `ConstExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A `const` block expression. For example:
-   * ```
-   * if const { SRC::IS_ZST || DEST::IS_ZST || mem::align_of::<SRC>() != mem::align_of::<DEST>() } {
-   *     return false;
-   * }
-   * ```
-   */
-  class ConstExpr extends Generated::ConstExpr { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll
new file mode 100644
index 0000000000000..8e89af434ee85
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Const`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Const
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Const` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Const extends Generated::Const { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstParamConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstParamConstructor.qll
new file mode 100644
index 0000000000000..5cf9881ee5589
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstParamConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ConstParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ConstParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructConstParam(Raw::ConstParam id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstParamImpl.qll
new file mode 100644
index 0000000000000..15248ed53a414
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstParamImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ConstParam`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ConstParam
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ConstParam` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ConstParam extends Generated::ConstParam { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
index 307478f060242..5f78d4d85ee1f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
@@ -12,22 +12,5 @@ private import codeql.rust.elements.internal.generated.ContinueExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A continue expression. For example:
-   * ```
-   * loop {
-   *     if not_ready() {
-   *         continue;
-   *     }
-   * }
-   * ```
-   * ```
-   * 'label: loop {
-   *     if not_ready() {
-   *         continue 'label;
-   *     }
-   * }
-   * ```
-   */
   class ContinueExpr extends Generated::ContinueExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DeclarationImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/DeclarationImpl.qll
deleted file mode 100644
index bbc67b1e2ee9b..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/DeclarationImpl.qll
+++ /dev/null
@@ -1,19 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `Declaration`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Declaration
-
-/**
- * INTERNAL: This module contains the customizable definition of `Declaration` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * The base class for declarations.
-   */
-  class Declaration extends Generated::Declaration { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll
new file mode 100644
index 0000000000000..6ee1e461a53ae
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `DynTraitType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `DynTraitType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructDynTraitType(Raw::DynTraitType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll
new file mode 100644
index 0000000000000..ef624527fa671
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `DynTraitType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.DynTraitType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `DynTraitType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class DynTraitType extends Generated::DynTraitType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ElementListExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ElementListExprConstructor.qll
deleted file mode 100644
index 1190f38db7c22..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ElementListExprConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ElementListExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `ElementListExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructElementListExpr(Raw::ElementListExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ElementListExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ElementListExprImpl.qll
deleted file mode 100644
index 8d0d9eef56c44..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ElementListExprImpl.qll
+++ /dev/null
@@ -1,23 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `ElementListExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.ElementListExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `ElementListExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * An element list expression. For example:
-   * ```
-   * [1, 2, 3, 4, 5];
-   * [1, 2, 3, 4, 5][0] = 6;
-   * ```
-   */
-  class ElementListExpr extends Generated::ElementListExpr { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/EnumConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/EnumConstructor.qll
new file mode 100644
index 0000000000000..72db497c284de
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/EnumConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Enum` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Enum` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructEnum(Raw::Enum id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
new file mode 100644
index 0000000000000..cccf603e7a059
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Enum`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Enum
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Enum` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Enum extends Generated::Enum { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExprImpl.qll
index a07961ca08257..dc8c86b6cc9d0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExprImpl.qll
@@ -12,8 +12,5 @@ private import codeql.rust.elements.internal.generated.Expr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * The base class for expressions.
-   */
   class Expr extends Generated::Expr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExprStmtImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExprStmtImpl.qll
index 1d0dd4f7289c4..b254ce5a77ef3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ExprStmtImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExprStmtImpl.qll
@@ -12,13 +12,5 @@ private import codeql.rust.elements.internal.generated.ExprStmt
  * be referenced directly.
  */
 module Impl {
-  /**
-   * An expression statement. For example:
-   * ```
-   * start();
-   * finish()
-   * use std::env;
-   * ```
-   */
   class ExprStmt extends Generated::ExprStmt { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternBlockConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternBlockConstructor.qll
new file mode 100644
index 0000000000000..5c96bf6053e5f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternBlockConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ExternBlock` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ExternBlock` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructExternBlock(Raw::ExternBlock id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternBlockImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternBlockImpl.qll
new file mode 100644
index 0000000000000..b65475196fd6b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternBlockImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ExternBlock`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ExternBlock
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ExternBlock` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ExternBlock extends Generated::ExternBlock { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternCrateConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternCrateConstructor.qll
new file mode 100644
index 0000000000000..99534bf238241
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternCrateConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ExternCrate` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ExternCrate` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructExternCrate(Raw::ExternCrate id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternCrateImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternCrateImpl.qll
new file mode 100644
index 0000000000000..146a574519ea4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternCrateImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ExternCrate`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ExternCrate
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ExternCrate` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ExternCrate extends Generated::ExternCrate { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternItemImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternItemImpl.qll
new file mode 100644
index 0000000000000..0f5ac310cb249
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternItemImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ExternItem`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ExternItem
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ExternItem` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ExternItem extends Generated::ExternItem { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternItemListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternItemListConstructor.qll
new file mode 100644
index 0000000000000..780c3b8c43651
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternItemListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ExternItemList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ExternItemList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructExternItemList(Raw::ExternItemList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExternItemListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExternItemListImpl.qll
new file mode 100644
index 0000000000000..beb3452f894de
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExternItemListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ExternItemList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ExternItemList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ExternItemList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ExternItemList extends Generated::ExternItemList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
index 62f869c6be600..8e301eb515cfa 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
@@ -12,11 +12,5 @@ private import codeql.rust.elements.internal.generated.FieldExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A field access expression. For example:
-   * ```
-   * x.foo
-   * ```
-   */
   class FieldExpr extends Generated::FieldExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FieldListImpl.qll
new file mode 100644
index 0000000000000..dc843147dbf22
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FieldListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `FieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.FieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `FieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class FieldList extends Generated::FieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FnConstructor.qll
new file mode 100644
index 0000000000000..9c7e2603f5f31
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FnConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Fn` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Fn` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructFn(Raw::Fn id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FnImpl.qll
new file mode 100644
index 0000000000000..8ad0391c86a8e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FnImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Fn`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Fn
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Fn` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Fn extends Generated::Fn { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll
new file mode 100644
index 0000000000000..a61677766d241
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `FnPtrType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `FnPtrType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructFnPtrType(Raw::FnPtrType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll
new file mode 100644
index 0000000000000..55b5e30c8fb79
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `FnPtrType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.FnPtrType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `FnPtrType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class FnPtrType extends Generated::FnPtrType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ForExprConstructor.qll
new file mode 100644
index 0000000000000..d229575cbc45f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ForExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ForExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructForExpr(Raw::ForExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ForExprImpl.qll
new file mode 100644
index 0000000000000..f3add3e4c146f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForExprImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ForExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ForExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ForExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ForExpr extends Generated::ForExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll
new file mode 100644
index 0000000000000..8bf0067976962
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ForType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ForType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructForType(Raw::ForType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll
new file mode 100644
index 0000000000000..9a0dc21fcdffd
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ForType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ForType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ForType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ForType extends Generated::ForType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll
new file mode 100644
index 0000000000000..0cf656f2d46ef
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `FormatArgsArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `FormatArgsArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructFormatArgsArg(Raw::FormatArgsArg id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll
new file mode 100644
index 0000000000000..8f3456adab7da
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `FormatArgsArg`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.FormatArgsArg
+
+/**
+ * INTERNAL: This module contains the customizable definition of `FormatArgsArg` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class FormatArgsArg extends Generated::FormatArgsArg { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll
new file mode 100644
index 0000000000000..0f07fc8998692
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `FormatArgsExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `FormatArgsExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructFormatArgsExpr(Raw::FormatArgsExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll
new file mode 100644
index 0000000000000..1a8e1da09a947
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `FormatArgsExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.FormatArgsExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `FormatArgsExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class FormatArgsExpr extends Generated::FormatArgsExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FunctionConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FunctionConstructor.qll
deleted file mode 100644
index 953627a925dd9..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/FunctionConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `Function` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `Function` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructFunction(Raw::Function id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericArgImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericArgImpl.qll
new file mode 100644
index 0000000000000..9705b928c4e0c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericArgImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `GenericArg`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.GenericArg
+
+/**
+ * INTERNAL: This module contains the customizable definition of `GenericArg` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class GenericArg extends Generated::GenericArg { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
index 27dc567d98d6f..edc4cf4b919a3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
@@ -12,11 +12,5 @@ private import codeql.rust.elements.internal.generated.GenericArgList
  * be referenced directly.
  */
 module Impl {
-  /**
-   * The base class for generic arguments.
-   * ```
-   * x.foo::<u32, u64>(42);
-   * ```
-   */
   class GenericArgList extends Generated::GenericArgList { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericParamImpl.qll
new file mode 100644
index 0000000000000..5a1d69c15a113
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericParamImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `GenericParam`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.GenericParam
+
+/**
+ * INTERNAL: This module contains the customizable definition of `GenericParam` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class GenericParam extends Generated::GenericParam { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericParamListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListConstructor.qll
new file mode 100644
index 0000000000000..20ee400ab9479
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `GenericParamList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `GenericParamList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructGenericParamList(Raw::GenericParamList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll
new file mode 100644
index 0000000000000..ef85a60f6ac5a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericParamListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `GenericParamList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.GenericParamList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `GenericParamList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class GenericParamList extends Generated::GenericParamList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
index d0b0e9f59b543..7c19e5f5fac7d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll
@@ -12,20 +12,5 @@ private import codeql.rust.elements.internal.generated.IdentPat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A binding pattern. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) => y,
-   *     Option::None => 0,
-   * };
-   * ```
-   * ```
-   * match x {
-   *     y@Option::Some(_) => y,
-   *     Option::None => 0,
-   * };
-   * ```
-   */
   class IdentPat extends Generated::IdentPat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
index 02768f422d603..e0ee97b4d35c7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
@@ -12,20 +12,5 @@ private import codeql.rust.elements.internal.generated.IfExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * An `if` expression. For example:
-   * ```
-   * if x == 42 {
-   *     println!("that's the answer");
-   * }
-   * ```
-   * ```
-   * let y = if x > 0 {
-   *     1
-   * } else {
-   *     0
-   * }
-   * ```
-   */
   class IfExpr extends Generated::IfExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplConstructor.qll
new file mode 100644
index 0000000000000..93bc646bc144f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Impl` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Impl` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructImpl(Raw::Impl id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
new file mode 100644
index 0000000000000..f6cef19ba389f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Impl`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Impl
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Impl` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Impl extends Generated::Impl { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll
new file mode 100644
index 0000000000000..242a3490708bc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ImplTraitType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ImplTraitType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructImplTraitType(Raw::ImplTraitType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll
new file mode 100644
index 0000000000000..1a31deee39f9d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ImplTraitType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ImplTraitType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ImplTraitType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ImplTraitType extends Generated::ImplTraitType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
index cd1db18e9b1f5..e700ce01ef32f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
@@ -12,12 +12,5 @@ private import codeql.rust.elements.internal.generated.IndexExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * An index expression. For example:
-   * ```
-   * list[42];
-   * list[42] = 1;
-   * ```
-   */
   class IndexExpr extends Generated::IndexExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll
new file mode 100644
index 0000000000000..8c3a0fcf0576f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `InferType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `InferType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructInferType(Raw::InferType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll
new file mode 100644
index 0000000000000..f9896fcb47074
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `InferType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.InferType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `InferType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class InferType extends Generated::InferType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll
new file mode 100644
index 0000000000000..8a24585ee7e8c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Item`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Item
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Item` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Item extends Generated::Item { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ItemListConstructor.qll
new file mode 100644
index 0000000000000..527e2897a6987
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ItemListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ItemList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ItemList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructItemList(Raw::ItemList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ItemListImpl.qll
new file mode 100644
index 0000000000000..b4d47c5096c74
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ItemListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ItemList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ItemList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ItemList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ItemList extends Generated::ItemList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemStmtConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ItemStmtConstructor.qll
deleted file mode 100644
index 3580cc315abb8..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ItemStmtConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ItemStmt` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `ItemStmt` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructItemStmt(Raw::ItemStmt id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemStmtImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ItemStmtImpl.qll
deleted file mode 100644
index 1589dd306e8aa..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ItemStmtImpl.qll
+++ /dev/null
@@ -1,25 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `ItemStmt`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.ItemStmt
-
-/**
- * INTERNAL: This module contains the customizable definition of `ItemStmt` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * An item statement. For example:
-   * ```
-   * fn print_hello() {
-   *     println!("Hello, world!");
-   * }
-   * print_hello();
-   * ```
-   */
-  class ItemStmt extends Generated::ItemStmt { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll
index 8b3484f887c54..ce51e125b72b3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.Label
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A label. For example:
-   * ```
-   * 'label: loop {
-   *     println!("Hello, world (once)!");
-   *     break 'label;
-   * };
-   * ```
-   */
   class Label extends Generated::Label { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetElseConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/LetElseConstructor.qll
new file mode 100644
index 0000000000000..73d624016d6e4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetElseConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `LetElse` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `LetElse` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructLetElse(Raw::LetElse id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
new file mode 100644
index 0000000000000..586566964f5ff
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `LetElse`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.LetElse
+
+/**
+ * INTERNAL: This module contains the customizable definition of `LetElse` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class LetElse extends Generated::LetElse { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll
index 47d7ee605026f..79c0ecb889088 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll
@@ -12,13 +12,5 @@ private import codeql.rust.elements.internal.generated.LetExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A `let` expression. For example:
-   * ```
-   * if let Some(x) = maybe_some {
-   *     println!("{}", x);
-   * }
-   * ```
-   */
   class LetExpr extends Generated::LetExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
index c373d8ef2a440..ac61dd4789682 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
@@ -12,17 +12,5 @@ private import codeql.rust.elements.internal.generated.LetStmt
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A let statement. For example:
-   * ```
-   * let x = 42;
-   * let x: i32 = 42;
-   * let x: i32;
-   * let x;
-   * let (x, y) = (1, 2);
-   * let Some(x) = std::env::var("FOO") else {
-   *     return;
-   * };
-   */
   class LetStmt extends Generated::LetStmt { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll
new file mode 100644
index 0000000000000..9613254710806
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `LifetimeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `LifetimeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructLifetimeArg(Raw::LifetimeArg id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgImpl.qll
new file mode 100644
index 0000000000000..183a8ef654016
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeArgImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `LifetimeArg`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.LifetimeArg
+
+/**
+ * INTERNAL: This module contains the customizable definition of `LifetimeArg` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class LifetimeArg extends Generated::LifetimeArg { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeConstructor.qll
new file mode 100644
index 0000000000000..0b853c987775d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Lifetime` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Lifetime` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructLifetime(Raw::Lifetime id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
new file mode 100644
index 0000000000000..fdad40216b015
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Lifetime`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Lifetime
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Lifetime` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Lifetime extends Generated::Lifetime { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll
new file mode 100644
index 0000000000000..f3c368fcfa29c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `LifetimeParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `LifetimeParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructLifetimeParam(Raw::LifetimeParam id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamImpl.qll
new file mode 100644
index 0000000000000..c59b3d521a021
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeParamImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `LifetimeParam`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.LifetimeParam
+
+/**
+ * INTERNAL: This module contains the customizable definition of `LifetimeParam` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class LifetimeParam extends Generated::LifetimeParam { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LiteralConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/LiteralConstructor.qll
new file mode 100644
index 0000000000000..964de3f23aeeb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LiteralConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Literal` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Literal` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructLiteral(Raw::Literal id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LiteralExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/LiteralExprConstructor.qll
deleted file mode 100644
index 8d095d9130b06..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/LiteralExprConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `LiteralExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `LiteralExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructLiteralExpr(Raw::LiteralExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
deleted file mode 100644
index 0178281bc1b73..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
+++ /dev/null
@@ -1,28 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `LiteralExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.LiteralExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `LiteralExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A literal expression. For example:
-   * ```
-   * 42;
-   * 42.0;
-   * "Hello, world!";
-   * b"Hello, world!";
-   * 'x';
-   * b'x';
-   * r"Hello, world!";
-   * true;
-   */
-  class LiteralExpr extends Generated::LiteralExpr { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LiteralImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LiteralImpl.qll
new file mode 100644
index 0000000000000..4c6b7239dbcf7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LiteralImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Literal`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Literal
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Literal` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Literal extends Generated::Literal { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
index ed0aa2c3e21cd..9cd51c5499f2e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.LiteralPat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A literal pattern. For example:
-   * ```
-   * match x {
-   *     42 => "ok",
-   *     _ => "fail",
-   * }
-   * ```
-   */
   class LiteralPat extends Generated::LiteralPat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LoopExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LoopExprImpl.qll
index fa8402e3562ef..7ca4b9917b5ea 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LoopExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LoopExprImpl.qll
@@ -12,29 +12,5 @@ private import codeql.rust.elements.internal.generated.LoopExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A loop expression. For example:
-   * ```
-   * loop {
-   *     println!("Hello, world (again)!");
-   * };
-   * ```
-   * ```
-   * 'label: loop {
-   *     println!("Hello, world (once)!");
-   *     break 'label;
-   * };
-   * ```
-   * ```
-   * let mut x = 0;
-   * loop {
-   *     if x < 10 {
-   *         x += 1;
-   *     } else {
-   *         break;
-   *     }
-   * };
-   * ```
-   */
   class LoopExpr extends Generated::LoopExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroCallConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroCallConstructor.qll
new file mode 100644
index 0000000000000..364fbc1845c66
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroCallConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroCall` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroCall` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroCall(Raw::MacroCall id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
new file mode 100644
index 0000000000000..96ef416265f67
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroCall`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroCall
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroCall` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MacroCall extends Generated::MacroCall { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroDefConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroDefConstructor.qll
new file mode 100644
index 0000000000000..56eb406f93028
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroDefConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroDef` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroDef` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroDef(Raw::MacroDef id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroDefImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroDefImpl.qll
new file mode 100644
index 0000000000000..04eb65db26005
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroDefImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroDef`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroDef
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroDef` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MacroDef extends Generated::MacroDef { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroExprConstructor.qll
new file mode 100644
index 0000000000000..ab916abe2688d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroExpr(Raw::MacroExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroExprImpl.qll
new file mode 100644
index 0000000000000..52b8840f6d965
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroExprImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MacroExpr extends Generated::MacroExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll
new file mode 100644
index 0000000000000..90c37c4f2788a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroItems` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroItems` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroItems(Raw::MacroItems id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll
new file mode 100644
index 0000000000000..9d04aff8b24ea
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroItemsImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroItems`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroItems
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroItems` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MacroItems extends Generated::MacroItems { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroPatConstructor.qll
new file mode 100644
index 0000000000000..2ddbecfb7b13b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroPatConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroPat(Raw::MacroPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroPatImpl.qll
new file mode 100644
index 0000000000000..2a78ee8f468cf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroPatImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroPat`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroPat
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroPat` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MacroPat extends Generated::MacroPat { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroRulesConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroRulesConstructor.qll
new file mode 100644
index 0000000000000..eaaac12bedac6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroRulesConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroRules` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroRules` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroRules(Raw::MacroRules id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroRulesImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroRulesImpl.qll
new file mode 100644
index 0000000000000..493d8eb1c270e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroRulesImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroRules`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroRules
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroRules` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MacroRules extends Generated::MacroRules { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll
new file mode 100644
index 0000000000000..6f5889551252e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroStmts` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroStmts` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroStmts(Raw::MacroStmts id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll
new file mode 100644
index 0000000000000..432a28e66ced7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroStmtsImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroStmts`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroStmts
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroStmts` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MacroStmts extends Generated::MacroStmts { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll
new file mode 100644
index 0000000000000..cbe65a8bed719
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroType(Raw::MacroType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll
new file mode 100644
index 0000000000000..5b50b4d795e9a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MacroType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MacroType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MacroType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MacroType extends Generated::MacroType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
index 181e092b2f07a..701b25790ac77 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
@@ -12,20 +12,5 @@ private import codeql.rust.elements.internal.generated.MatchArm
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A match arm. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) => y,
-   *     Option::None => 0,
-   * };
-   * ```
-   * ```
-   * match x {
-   *     Some(y) if y != 0 => 1 / y,
-   *     _ => 0,
-   * };
-   * ```
-   */
   class MatchArm extends Generated::MatchArm { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchArmListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchArmListConstructor.qll
new file mode 100644
index 0000000000000..faf8223a3b6c2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchArmListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MatchArmList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MatchArmList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMatchArmList(Raw::MatchArmList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchArmListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchArmListImpl.qll
new file mode 100644
index 0000000000000..9575a4747f9a5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchArmListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MatchArmList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MatchArmList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MatchArmList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MatchArmList extends Generated::MatchArmList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
index ecd7f5c307aea..99d94b58fe37d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
@@ -12,20 +12,5 @@ private import codeql.rust.elements.internal.generated.MatchExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A match expression. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) => y,
-   *     Option::None => 0,
-   * }
-   * ```
-   * ```
-   * match x {
-   *     Some(y) if y != 0 => 1 / y,
-   *     _ => 0,
-   * }
-   * ```
-   */
   class MatchExpr extends Generated::MatchExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchGuardConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchGuardConstructor.qll
new file mode 100644
index 0000000000000..58e765e741b98
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchGuardConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MatchGuard` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MatchGuard` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMatchGuard(Raw::MatchGuard id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchGuardImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchGuardImpl.qll
new file mode 100644
index 0000000000000..a810c603e27ba
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchGuardImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `MatchGuard`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.MatchGuard
+
+/**
+ * INTERNAL: This module contains the customizable definition of `MatchGuard` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class MatchGuard extends Generated::MatchGuard { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MetaConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MetaConstructor.qll
new file mode 100644
index 0000000000000..0cd1ca6bbe9f0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MetaConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Meta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Meta` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMeta(Raw::Meta id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MetaImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MetaImpl.qll
new file mode 100644
index 0000000000000..e3b36f05d0576
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MetaImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Meta`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Meta
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Meta` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Meta extends Generated::Meta { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
index d4e6c77b91971..7d235c28497de 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
@@ -12,11 +12,5 @@ private import codeql.rust.elements.internal.generated.MethodCallExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A method call expression. For example:
-   * ```
-   * x.foo(42);
-   * x.foo::<u32, u64>(42);
-   */
   class MethodCallExpr extends Generated::MethodCallExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MissingConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MissingConstructor.qll
new file mode 100644
index 0000000000000..8dbd1bddd6dee
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MissingConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Missing` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Missing` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMissing(Raw::Missing id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MissingExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MissingExprConstructor.qll
deleted file mode 100644
index 9c315efd52607..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/MissingExprConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `MissingExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `MissingExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructMissingExpr(Raw::MissingExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MissingExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MissingExprImpl.qll
deleted file mode 100644
index 5c7e61677dd26..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/MissingExprImpl.qll
+++ /dev/null
@@ -1,23 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `MissingExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.MissingExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `MissingExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A missing expression, used as a placeholder for incomplete syntax.
-   *
-   * ```
-   * let x = non_existing_macro!();
-   * ```
-   */
-  class MissingExpr extends Generated::MissingExpr { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MissingPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MissingPatConstructor.qll
deleted file mode 100644
index 5c2176ab269f0..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/MissingPatConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `MissingPat` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `MissingPat` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructMissingPat(Raw::MissingPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MissingPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MissingPatImpl.qll
deleted file mode 100644
index e5b7e4cf97404..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/MissingPatImpl.qll
+++ /dev/null
@@ -1,24 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `MissingPat`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.MissingPat
-
-/**
- * INTERNAL: This module contains the customizable definition of `MissingPat` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A missing pattern, used as a place holder for incomplete syntax.
-   * ```
-   * match Some(42) {
-   *     .. => "bad use of .. syntax",
-   * };
-   * ```
-   */
-  class MissingPat extends Generated::MissingPat { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
index c17e5c42e92ae..5f9a254f35e2e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
@@ -12,16 +12,5 @@ private import codeql.rust.elements.internal.generated.Module
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A module declaration. For example:
-   * ```
-   * mod foo;
-   * ```
-   * ```
-   * mod bar {
-   *     pub fn baz() {}
-   * }
-   * ```
-   */
   class Module extends Generated::Module { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NameConstructor.qll
new file mode 100644
index 0000000000000..139908a3490ce
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Name` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Name` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructName(Raw::Name id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll
new file mode 100644
index 0000000000000..8d788126ae708
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Name`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Name
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Name` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Name extends Generated::Name { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameRefConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NameRefConstructor.qll
new file mode 100644
index 0000000000000..8f90d066b5157
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameRefConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `NameRef` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `NameRef` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructNameRef(Raw::NameRef id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
new file mode 100644
index 0000000000000..b663b59d93ad9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NameRefImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `NameRef`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.NameRef
+
+/**
+ * INTERNAL: This module contains the customizable definition of `NameRef` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class NameRef extends Generated::NameRef { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll
new file mode 100644
index 0000000000000..10b7b835e8192
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `NeverType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `NeverType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructNeverType(Raw::NeverType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll
new file mode 100644
index 0000000000000..fa201b2b5b7e1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `NeverType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.NeverType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `NeverType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class NeverType extends Generated::NeverType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll
index c494a957939b2..e440f7f317c35 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll
@@ -12,11 +12,5 @@ private import codeql.rust.elements.internal.generated.OffsetOfExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   *  An `offset_of` expression. For example:
-   * ```
-   * builtin # offset_of(Struct, field);
-   * ```
-   */
   class OffsetOfExpr extends Generated::OffsetOfExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
index 43e7e38d6fa68..01379ef8d5e86 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
@@ -12,13 +12,5 @@ private import codeql.rust.elements.internal.generated.OrPat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * An or pattern. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) | Option::None => 0,
-   * }
-   * ```
-   */
   class OrPat extends Generated::OrPat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamConstructor.qll
new file mode 100644
index 0000000000000..5bbdbe61af339
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Param` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Param` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParam(Raw::Param id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
new file mode 100644
index 0000000000000..89c346e6969fe
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Param`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Param
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Param` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Param extends Generated::Param { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamListConstructor.qll
new file mode 100644
index 0000000000000..53cb78f4be7ab
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ParamList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ParamList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParamList(Raw::ParamList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamListImpl.qll
new file mode 100644
index 0000000000000..97ba6eaa60942
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ParamList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ParamList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ParamList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ParamList extends Generated::ParamList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenExprConstructor.qll
new file mode 100644
index 0000000000000..95452ccb610a8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ParenExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ParenExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParenExpr(Raw::ParenExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
new file mode 100644
index 0000000000000..acabc632d5660
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ParenExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ParenExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ParenExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ParenExpr extends Generated::ParenExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenPatConstructor.qll
new file mode 100644
index 0000000000000..68ef6e0b0365e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenPatConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ParenPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ParenPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParenPat(Raw::ParenPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
new file mode 100644
index 0000000000000..9e2ff4d698e14
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ParenPat`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ParenPat
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ParenPat` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ParenPat extends Generated::ParenPat { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll
new file mode 100644
index 0000000000000..f8450946a0b0f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ParenType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ParenType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParenType(Raw::ParenType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll
new file mode 100644
index 0000000000000..145a84d7244d9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ParenType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ParenType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ParenType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ParenType extends Generated::ParenType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PatImpl.qll
index a6266bdad7a66..29b24c7073d7f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PatImpl.qll
@@ -12,8 +12,5 @@ private import codeql.rust.elements.internal.generated.Pat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * The base class for patterns.
-   */
   class Pat extends Generated::Pat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
index e8ee082c54636..46667524d3f59 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.PathExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A path expression. For example:
-   * ```
-   * let x = variable;
-   * let x = foo::bar;
-   * let y = <T>::foo;
-   * let z = <TypeRef as Trait>::foo;
-   * ```
-   */
   class PathExpr extends Generated::PathExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
index b1f5b9eb5998e..c0e8b9cee1f73 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
@@ -12,11 +12,5 @@ private import codeql.rust.elements.internal.generated.Path
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A path. For example:
-   * ```
-   * foo::bar;
-   * ```
-   */
   class Path extends Generated::Path { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
index 775db34f24c91..a6826c36584ff 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.PathPat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A path pattern. For example:
-   * ```
-   * match x {
-   *     Foo::Bar => "ok",
-   *     _ => "fail",
-   * }
-   * ```
-   */
   class PathPat extends Generated::PathPat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentConstructor.qll
new file mode 100644
index 0000000000000..cc5d0f2eee652
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `PathSegment` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `PathSegment` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructPathSegment(Raw::PathSegment id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
new file mode 100644
index 0000000000000..d282d0e2426ab
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `PathSegment`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.PathSegment
+
+/**
+ * INTERNAL: This module contains the customizable definition of `PathSegment` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class PathSegment extends Generated::PathSegment { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll
new file mode 100644
index 0000000000000..f16371570f679
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `PathType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `PathType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructPathType(Raw::PathType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll
new file mode 100644
index 0000000000000..8eddc4c5dda76
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `PathType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.PathType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `PathType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class PathType extends Generated::PathType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
index 58399b806edea..51bcde87a29f5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PrefixExprImpl.qll
@@ -12,13 +12,5 @@ private import codeql.rust.elements.internal.generated.PrefixExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A unary operation expression. For example:
-   * ```
-   * let x = -42
-   * let y = !true
-   * let z = *ptr
-   * ```
-   */
   class PrefixExpr extends Generated::PrefixExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll
new file mode 100644
index 0000000000000..48fb82aeb9e4c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `PtrType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `PtrType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructPtrType(Raw::PtrType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll
new file mode 100644
index 0000000000000..c968bdeadc7a0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `PtrType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.PtrType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `PtrType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class PtrType extends Generated::PtrType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
index 2745ddc396b4a..6dd3fc5adc14f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
@@ -12,16 +12,5 @@ private import codeql.rust.elements.internal.generated.RangeExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A range expression. For example:
-   * ```
-   * let x = 1..=10;
-   * let x = 1..10;
-   * let x = 10..;
-   * let x = ..10;
-   * let x = ..=10;
-   * let x = ..;
-   * ```
-   */
   class RangeExpr extends Generated::RangeExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RangePatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RangePatImpl.qll
index 2b59f910fc5f8..61b8659b452b2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RangePatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RangePatImpl.qll
@@ -12,15 +12,5 @@ private import codeql.rust.elements.internal.generated.RangePat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A range pattern. For example:
-   * ```
-   * match x {
-   *     ..15 => "too cold",
-   *     16..=25 => "just right",
-   *     26.. => "too hot",
-   * }
-   * ```
-   */
   class RangePat extends Generated::RangePat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll
index 920b5dc9efd3a..f0bde6b05a46c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll
@@ -12,11 +12,5 @@ private import codeql.rust.elements.internal.generated.RecordExprField
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A field in a record expression. For example `a: 1` in:
-   * ```
-   * Foo { a: 1, b: 2 };
-   * ```
-   */
   class RecordExprField extends Generated::RecordExprField { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll
new file mode 100644
index 0000000000000..6ced8f30ce413
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RecordExprFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RecordExprFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRecordExprFieldList(Raw::RecordExprFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll
new file mode 100644
index 0000000000000..91eaff6654d6c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RecordExprFieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RecordExprFieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RecordExprFieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class RecordExprFieldList extends Generated::RecordExprFieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll
index 2367d46d3ecaa..b55dbcb7599a5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.RecordExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A record expression. For example:
-   * ```
-   * let first = Foo { a: 1, b: 2 };
-   * let second = Foo { a: 2, ..first };
-   * Foo { a: 1, b: 2 }[2] = 10;
-   * Foo { .. } = second;
-   * ```
-   */
   class RecordExpr extends Generated::RecordExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldConstructor.qll
new file mode 100644
index 0000000000000..2a4ea101e5b16
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RecordField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RecordField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRecordField(Raw::RecordField id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldImpl.qll
new file mode 100644
index 0000000000000..ba3b319383e1f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RecordField`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RecordField
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RecordField` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class RecordField extends Generated::RecordField { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll
new file mode 100644
index 0000000000000..184df0deb036b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RecordFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RecordFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRecordFieldList(Raw::RecordFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListImpl.qll
new file mode 100644
index 0000000000000..34fb21e5ce28d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordFieldListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RecordFieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RecordFieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RecordFieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class RecordFieldList extends Generated::RecordFieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll
index 78952058b1ab7..7dc44dd849e49 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll
@@ -12,11 +12,5 @@ private import codeql.rust.elements.internal.generated.RecordPatField
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A field in a record pattern. For example `a: 1` in:
-   * ```
-   * let Foo { a: 1, b: 2 } = foo;
-   * ```
-   */
   class RecordPatField extends Generated::RecordPatField { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll
new file mode 100644
index 0000000000000..a9af6ed2acb8e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RecordPatFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RecordPatFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRecordPatFieldList(Raw::RecordPatFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll
new file mode 100644
index 0000000000000..2a97fdadc0fad
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RecordPatFieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RecordPatFieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RecordPatFieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class RecordPatFieldList extends Generated::RecordPatFieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll
index 4ddb1ba2b838a..814827bcb6014 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.RecordPat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A record pattern. For example:
-   * ```
-   * match x {
-   *     Foo { a: 1, b: 2 } => "ok",
-   *     Foo { .. } => "fail",
-   * }
-   * ```
-   */
   class RecordPat extends Generated::RecordPat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
index 13cdb5b836d15..1818238e636ca 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.RefExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A reference expression. For example:
-   * ```
-   *     let ref_const = &foo;
-   *     let ref_mut = &mut foo;
-   *     let raw_const: &mut i32 = &raw const foo;
-   *     let raw_mut: &mut i32 = &raw mut foo;
-   * ```
-   */
   class RefExpr extends Generated::RefExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
index cef7ebf0fdd00..812f422b556d7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.RefPat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A reference pattern. For example:
-   * ```
-   * match x {
-   *     &mut Option::Some(y) => y,
-   *     &Option::None => 0,
-   * };
-   * ```
-   */
   class RefPat extends Generated::RefPat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll
new file mode 100644
index 0000000000000..89a786420a212
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RefType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RefType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRefType(Raw::RefType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll
new file mode 100644
index 0000000000000..87aadf10fa003
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RefType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RefType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RefType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class RefType extends Generated::RefType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RenameConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RenameConstructor.qll
new file mode 100644
index 0000000000000..5edcea656b1ca
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RenameConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Rename` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Rename` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRename(Raw::Rename id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RenameImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RenameImpl.qll
new file mode 100644
index 0000000000000..18ed41b60ffb3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RenameImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Rename`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Rename
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Rename` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Rename extends Generated::Rename { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RepeatExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RepeatExprConstructor.qll
deleted file mode 100644
index 4d495075c0f86..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RepeatExprConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `RepeatExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RepeatExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRepeatExpr(Raw::RepeatExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RepeatExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RepeatExprImpl.qll
deleted file mode 100644
index 41dc641c0b937..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RepeatExprImpl.qll
+++ /dev/null
@@ -1,21 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `RepeatExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RepeatExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `RepeatExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A repeat expression. For example:
-   * ```
-   * [1; 10];
-   */
-  class RepeatExpr extends Generated::RepeatExpr { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RestPatConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RestPatConstructor.qll
new file mode 100644
index 0000000000000..940a40e92e3eb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RestPatConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RestPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RestPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRestPat(Raw::RestPat id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
new file mode 100644
index 0000000000000..82a08884ccf8e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RestPat`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RestPat
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RestPat` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class RestPat extends Generated::RestPat { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll
new file mode 100644
index 0000000000000..c123b5f8b9344
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `RetType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `RetType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRetType(Raw::RetType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll
new file mode 100644
index 0000000000000..cc45ae8adadad
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RetType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RetType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RetType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class RetType extends Generated::RetType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
index 2dd96286a89cf..86ee1a1bef72f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
@@ -12,18 +12,5 @@ private import codeql.rust.elements.internal.generated.ReturnExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A return expression. For example:
-   * ```
-   * fn some_value() -> i32 {
-   *     return 42;
-   * }
-   * ```
-   * ```
-   * fn no_value() -> () {
-   *     return;
-   * }
-   * ```
-   */
   class ReturnExpr extends Generated::ReturnExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll
new file mode 100644
index 0000000000000..797df79b29d2d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ReturnTypeSyntax` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ReturnTypeSyntax` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructReturnTypeSyntax(Raw::ReturnTypeSyntax id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll
new file mode 100644
index 0000000000000..4c55c27de6faf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ReturnTypeSyntax`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ReturnTypeSyntax
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ReturnTypeSyntax` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ReturnTypeSyntax extends Generated::ReturnTypeSyntax { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SelfParamConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/SelfParamConstructor.qll
new file mode 100644
index 0000000000000..a088bd9112471
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SelfParamConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `SelfParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `SelfParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructSelfParam(Raw::SelfParam id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll
new file mode 100644
index 0000000000000..65543aea0adfa
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `SelfParam`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.SelfParam
+
+/**
+ * INTERNAL: This module contains the customizable definition of `SelfParam` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class SelfParam extends Generated::SelfParam { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SlicePatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/SlicePatImpl.qll
index dc482ddbc44fa..491d5672ecddb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/SlicePatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/SlicePatImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.SlicePat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A slice pattern. For example:
-   * ```
-   * match x {
-   *     [1, 2, 3, 4, 5] => "ok",
-   *     [1, 2, ..] => "fail",
-   *     [x, y, .., z, 7] => "fail",
-   * }
-   */
   class SlicePat extends Generated::SlicePat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll
new file mode 100644
index 0000000000000..d337c0f076841
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `SliceType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `SliceType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructSliceType(Raw::SliceType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll
new file mode 100644
index 0000000000000..eea9c5c26553e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `SliceType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.SliceType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `SliceType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class SliceType extends Generated::SliceType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SourceFileConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/SourceFileConstructor.qll
new file mode 100644
index 0000000000000..789023978860f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SourceFileConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `SourceFile` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `SourceFile` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructSourceFile(Raw::SourceFile id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SourceFileImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/SourceFileImpl.qll
new file mode 100644
index 0000000000000..8a8de59d87c63
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SourceFileImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `SourceFile`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.SourceFile
+
+/**
+ * INTERNAL: This module contains the customizable definition of `SourceFile` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class SourceFile extends Generated::SourceFile { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StaticConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StaticConstructor.qll
new file mode 100644
index 0000000000000..b9223b8d7c823
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StaticConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Static` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Static` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStatic(Raw::Static id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StaticImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StaticImpl.qll
new file mode 100644
index 0000000000000..6abb28bbc776a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StaticImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Static`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Static
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Static` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Static extends Generated::Static { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StmtImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StmtImpl.qll
index cb812f3c4ed40..65a235695e115 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/StmtImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StmtImpl.qll
@@ -12,8 +12,5 @@ private import codeql.rust.elements.internal.generated.Stmt
  * be referenced directly.
  */
 module Impl {
-  /**
-   * The base class for statements.
-   */
   class Stmt extends Generated::Stmt { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StmtListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StmtListConstructor.qll
new file mode 100644
index 0000000000000..e7aa6587ad42d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StmtListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `StmtList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `StmtList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStmtList(Raw::StmtList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StmtListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StmtListImpl.qll
new file mode 100644
index 0000000000000..d4a15e8a28e36
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StmtListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `StmtList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.StmtList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `StmtList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class StmtList extends Generated::StmtList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/StructConstructor.qll
new file mode 100644
index 0000000000000..da5fa96e43631
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Struct` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Struct` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructStruct(Raw::Struct id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
new file mode 100644
index 0000000000000..2639efd576152
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Struct`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Struct
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Struct` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Struct extends Generated::Struct { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TokenTreeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeConstructor.qll
new file mode 100644
index 0000000000000..df04d5a27e056
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TokenTree` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TokenTree` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTokenTree(Raw::TokenTree id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TokenTreeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeImpl.qll
new file mode 100644
index 0000000000000..9719f6267d1b6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TokenTreeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TokenTree`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TokenTree
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TokenTree` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TokenTree extends Generated::TokenTree { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll
new file mode 100644
index 0000000000000..ee417d726513e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitAliasConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TraitAlias` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TraitAlias` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTraitAlias(Raw::TraitAlias id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitAliasImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitAliasImpl.qll
new file mode 100644
index 0000000000000..2e581ba750796
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitAliasImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TraitAlias`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TraitAlias
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TraitAlias` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TraitAlias extends Generated::TraitAlias { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitConstructor.qll
new file mode 100644
index 0000000000000..dd1039c57433a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Trait` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Trait` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTrait(Raw::Trait id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
new file mode 100644
index 0000000000000..fd9bf05367dc6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Trait`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Trait
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Trait` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Trait extends Generated::Trait { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TryExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TryExprConstructor.qll
new file mode 100644
index 0000000000000..2140ce17e613e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TryExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TryExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TryExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTryExpr(Raw::TryExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TryExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TryExprImpl.qll
new file mode 100644
index 0000000000000..1f348cb24225b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TryExprImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TryExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TryExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TryExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TryExpr extends Generated::TryExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll
index bf94574f612da..0aa76f871641f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll
@@ -12,12 +12,5 @@ private import codeql.rust.elements.internal.generated.TupleExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A tuple expression. For example:
-   * ```
-   * (1, "one");
-   * (2, "two")[0] = 3;
-   * ```
-   */
   class TupleExpr extends Generated::TupleExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleFieldConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldConstructor.qll
new file mode 100644
index 0000000000000..a9eb94c08bf22
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TupleField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TupleField` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTupleField(Raw::TupleField id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldImpl.qll
new file mode 100644
index 0000000000000..823b5ab6e2e1b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TupleField`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TupleField
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TupleField` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TupleField extends Generated::TupleField { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll
new file mode 100644
index 0000000000000..80d714d047171
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TupleFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TupleFieldList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTupleFieldList(Raw::TupleFieldList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListImpl.qll
new file mode 100644
index 0000000000000..fe48612c1f300
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleFieldListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TupleFieldList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TupleFieldList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TupleFieldList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TupleFieldList extends Generated::TupleFieldList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TuplePatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TuplePatImpl.qll
index b8ed4fa62c24e..7e6a24e00ebb5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TuplePatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TuplePatImpl.qll
@@ -12,12 +12,5 @@ private import codeql.rust.elements.internal.generated.TuplePat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A tuple pattern. For example:
-   * ```
-   * let (x, y) = (1, 2);
-   * let (a, b, ..,  z) = (1, 2, 3, 4, 5);
-   * ```
-   */
   class TuplePat extends Generated::TuplePat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll
index e1dc22d73216e..095fd054f21fc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll
@@ -12,15 +12,5 @@ private import codeql.rust.elements.internal.generated.TupleStructPat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A tuple struct pattern. For example:
-   * ```
-   * match x {
-   *     Tuple("a", 1, 2, 3) => "great",
-   *     Tuple(.., 3) => "fine",
-   *     Tuple(..) => "fail",
-   * };
-   * ```
-   */
   class TupleStructPat extends Generated::TupleStructPat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll
new file mode 100644
index 0000000000000..f96bc1826a9d2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TupleType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TupleType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTupleType(Raw::TupleType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll
new file mode 100644
index 0000000000000..44bf5175a1208
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TupleType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TupleType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TupleType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TupleType extends Generated::TupleType { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeAliasConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeAliasConstructor.qll
new file mode 100644
index 0000000000000..60d8b576a1b58
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeAliasConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TypeAlias` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TypeAlias` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTypeAlias(Raw::TypeAlias id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeAliasImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeAliasImpl.qll
new file mode 100644
index 0000000000000..7085937b2dcd6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeAliasImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TypeAlias`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TypeAlias
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TypeAlias` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TypeAlias extends Generated::TypeAlias { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeArgConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeArgConstructor.qll
new file mode 100644
index 0000000000000..5904fbfcc194a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeArgConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TypeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TypeArg` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTypeArg(Raw::TypeArg id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeArgImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeArgImpl.qll
new file mode 100644
index 0000000000000..23eac7328eee6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeArgImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TypeArg`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TypeArg
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TypeArg` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TypeArg extends Generated::TypeArg { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundConstructor.qll
new file mode 100644
index 0000000000000..6cae579034729
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TypeBound` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TypeBound` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTypeBound(Raw::TypeBound id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll
new file mode 100644
index 0000000000000..e5eca26b6ba60
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TypeBound`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TypeBound
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TypeBound` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TypeBound extends Generated::TypeBound { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll
new file mode 100644
index 0000000000000..4a01215164ae0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TypeBoundList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TypeBoundList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTypeBoundList(Raw::TypeBoundList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll
new file mode 100644
index 0000000000000..d9776797f5a3d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TypeBoundList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TypeBoundList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TypeBoundList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TypeBoundList extends Generated::TypeBoundList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeImpl.qll
new file mode 100644
index 0000000000000..1af3b7d898ee7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Type`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Type
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Type` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Type extends Generated::Type { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeParamConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeParamConstructor.qll
new file mode 100644
index 0000000000000..22307a574555e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeParamConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TypeParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TypeParam` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTypeParam(Raw::TypeParam id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
new file mode 100644
index 0000000000000..c7a6b39bbae27
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `TypeParam`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.TypeParam
+
+/**
+ * INTERNAL: This module contains the customizable definition of `TypeParam` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class TypeParam extends Generated::TypeParam { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeRefConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeRefConstructor.qll
deleted file mode 100644
index b55c308a96399..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeRefConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `TypeRef` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `TypeRef` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructTypeRef(Raw::TypeRef id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeRefImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeRefImpl.qll
deleted file mode 100644
index b7fb9091b2bc1..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeRefImpl.qll
+++ /dev/null
@@ -1,24 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `TypeRef`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.TypeRef
-
-/**
- * INTERNAL: This module contains the customizable definition of `TypeRef` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * The base class for type references.
-   * ```
-   * let x: i32;
-   * let y: Vec<i32>;
-   * let z: Option<i32>;
-   * ```
-   */
-  class TypeRef extends Generated::TypeRef { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
index 5f6d07659bfea..b228aabedad97 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
@@ -12,11 +12,5 @@ private import codeql.rust.elements.internal.generated.UnderscoreExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * An underscore expression. For example:
-   * ```
-   * _ = 42;
-   * ```
-   */
   class UnderscoreExpr extends Generated::UnderscoreExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnimplementedConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UnimplementedConstructor.qll
new file mode 100644
index 0000000000000..4b36982709ae7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnimplementedConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Unimplemented` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Unimplemented` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructUnimplemented(Raw::Unimplemented id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationConstructor.qll
deleted file mode 100644
index 50c9bbf4a4995..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `UnimplementedDeclaration` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `UnimplementedDeclaration` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructUnimplementedDeclaration(Raw::UnimplementedDeclaration id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationImpl.qll
deleted file mode 100644
index a6e4cca24aaf5..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/UnimplementedDeclarationImpl.qll
+++ /dev/null
@@ -1,19 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `UnimplementedDeclaration`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.UnimplementedDeclaration
-
-/**
- * INTERNAL: This module contains the customizable definition of `UnimplementedDeclaration` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A declaration that is not yet extracted.
-   */
-  class UnimplementedDeclaration extends Generated::UnimplementedDeclaration { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnionConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UnionConstructor.qll
new file mode 100644
index 0000000000000..44666dab0dc16
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnionConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Union` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Union` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructUnion(Raw::Union id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
new file mode 100644
index 0000000000000..c64672ea8895c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Union`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Union
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Union` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Union extends Generated::Union { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprConstructor.qll
deleted file mode 100644
index 463bd691e970e..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `UnsafeBlockExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `UnsafeBlockExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructUnsafeBlockExpr(Raw::UnsafeBlockExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprImpl.qll
deleted file mode 100644
index 4567e550e13a4..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/UnsafeBlockExprImpl.qll
+++ /dev/null
@@ -1,25 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `UnsafeBlockExpr`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.UnsafeBlockExpr
-
-/**
- * INTERNAL: This module contains the customizable definition of `UnsafeBlockExpr` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * An unsafe block expression. For example:
-   * ```
-   * let layout = unsafe {
-   *     let x = 42;
-   *     Layout::from_size_align_unchecked(size, align)
-   * };
-   * ```
-   */
-  class UnsafeBlockExpr extends Generated::UnsafeBlockExpr { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UseConstructor.qll
new file mode 100644
index 0000000000000..297edbad06717
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Use` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Use` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructUse(Raw::Use id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll
new file mode 100644
index 0000000000000..790647c95b400
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Use`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Use
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Use` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Use extends Generated::Use { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseTreeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UseTreeConstructor.qll
new file mode 100644
index 0000000000000..8ccf2452d0c0c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseTreeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `UseTree` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `UseTree` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructUseTree(Raw::UseTree id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.qll
new file mode 100644
index 0000000000000..9a0291dbf5dfa
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseTreeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `UseTree`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.UseTree
+
+/**
+ * INTERNAL: This module contains the customizable definition of `UseTree` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class UseTree extends Generated::UseTree { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseTreeListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/UseTreeListConstructor.qll
new file mode 100644
index 0000000000000..08409e028c35f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseTreeListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `UseTreeList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `UseTreeList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructUseTreeList(Raw::UseTreeList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseTreeListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UseTreeListImpl.qll
new file mode 100644
index 0000000000000..0ff9138748341
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseTreeListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `UseTreeList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.UseTreeList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `UseTreeList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class UseTreeList extends Generated::UseTreeList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantConstructor.qll
new file mode 100644
index 0000000000000..cbede6052059e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Variant` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Variant` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructVariant(Raw::Variant id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
new file mode 100644
index 0000000000000..7621263980485
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Variant`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Variant
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Variant` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Variant extends Generated::Variant { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantListConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantListConstructor.qll
new file mode 100644
index 0000000000000..f67d2b892c35d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantListConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `VariantList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `VariantList` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructVariantList(Raw::VariantList id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantListImpl.qll
new file mode 100644
index 0000000000000..c547b28703099
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantListImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `VariantList`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.VariantList
+
+/**
+ * INTERNAL: This module contains the customizable definition of `VariantList` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class VariantList extends Generated::VariantList { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VisibilityConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/VisibilityConstructor.qll
new file mode 100644
index 0000000000000..28debc84650ca
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VisibilityConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `Visibility` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `Visibility` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructVisibility(Raw::Visibility id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll
new file mode 100644
index 0000000000000..ad39f66286ad3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/VisibilityImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Visibility`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Visibility
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Visibility` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class Visibility extends Generated::Visibility { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WhereClauseConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/WhereClauseConstructor.qll
new file mode 100644
index 0000000000000..4df63457380e0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WhereClauseConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `WhereClause` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `WhereClause` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructWhereClause(Raw::WhereClause id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WhereClauseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WhereClauseImpl.qll
new file mode 100644
index 0000000000000..0b16d8738084c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WhereClauseImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `WhereClause`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.WhereClause
+
+/**
+ * INTERNAL: This module contains the customizable definition of `WhereClause` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class WhereClause extends Generated::WhereClause { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WherePredConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/WherePredConstructor.qll
new file mode 100644
index 0000000000000..fd6bc435b2db2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WherePredConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `WherePred` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `WherePred` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructWherePred(Raw::WherePred id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll
new file mode 100644
index 0000000000000..95e0c3ad2a534
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `WherePred`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.WherePred
+
+/**
+ * INTERNAL: This module contains the customizable definition of `WherePred` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class WherePred extends Generated::WherePred { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WhileExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/WhileExprConstructor.qll
new file mode 100644
index 0000000000000..66cd0d7ac8864
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WhileExprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `WhileExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `WhileExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructWhileExpr(Raw::WhileExpr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WhileExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WhileExprImpl.qll
new file mode 100644
index 0000000000000..fd131754108c4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/WhileExprImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `WhileExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.WhileExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `WhileExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class WhileExpr extends Generated::WhileExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
index 012cf08874e23..3baeade332b80 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
@@ -12,11 +12,5 @@ private import codeql.rust.elements.internal.generated.WildcardPat
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A wildcard pattern. For example:
-   * ```
-   * let _ = 42;
-   * ```
-   */
   class WildcardPat extends Generated::WildcardPat { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/YeetExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/YeetExprImpl.qll
index 87b61de1bafe8..4d4554ff7ec1a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/YeetExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/YeetExprImpl.qll
@@ -12,13 +12,5 @@ private import codeql.rust.elements.internal.generated.YeetExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A `yeet` expression. For example:
-   * ```
-   * if x < size {
-   *    do yeet "index out of bounds";
-   * }
-   * ```
-   */
   class YeetExpr extends Generated::YeetExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/YieldExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/YieldExprImpl.qll
index c115d622f5956..b76e121f94841 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/YieldExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/YieldExprImpl.qll
@@ -12,14 +12,5 @@ private import codeql.rust.elements.internal.generated.YieldExpr
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A `yield` expression. For example:
-   * ```
-   * let one = #[coroutine]
-   *     || {
-   *         yield 1;
-   *     };
-   * ```
-   */
   class YieldExpr extends Generated::YieldExpr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Abi.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Abi.qll
new file mode 100644
index 0000000000000..2ae5f48565c50
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Abi.qll
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Abi`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Abi` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Abi` class directly.
+   * Use the subclass `Abi`, where the following predicates are available.
+   */
+  class Abi extends Synth::TAbi, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Abi" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Adt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Adt.qll
new file mode 100644
index 0000000000000..7aa5c59d8f634
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Adt.qll
@@ -0,0 +1,21 @@
+// 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Adt` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Adt` class directly.
+   * Use the subclass `Adt`, where the following predicates are available.
+   */
+  class Adt extends Synth::TAdt, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArgList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArgList.qll
new file mode 100644
index 0000000000000..8fb3a91cb3098
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArgList.qll
@@ -0,0 +1,42 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ArgList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Expr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ArgList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ArgList` class directly.
+   * Use the subclass `ArgList`, where the following predicates are available.
+   */
+  class ArgList extends Synth::TArgList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ArgList" }
+
+    /**
+     * Gets the `index`th argument of this argument list (0-based).
+     */
+    Expr getArg(int index) {
+      result =
+        Synth::convertExprFromRaw(Synth::convertArgListToRaw(this).(Raw::ArgList).getArg(index))
+    }
+
+    /**
+     * Gets any of the arguments of this argument list.
+     */
+    final Expr getAnArg() { result = this.getArg(_) }
+
+    /**
+     * Gets the number of arguments of this argument list.
+     */
+    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
index 03a7230e7eec2..e728257931afe 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
@@ -6,6 +6,8 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
 /**
@@ -14,13 +16,46 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * An array expression. For example:
-   * ```
-   * [1, 2, 3];
-   * [1; 10];
-   * ```
    * INTERNAL: Do not reference the `Generated::ArrayExpr` class directly.
    * Use the subclass `ArrayExpr`, where the following predicates are available.
    */
-  class ArrayExpr extends Synth::TArrayExpr, ExprImpl::Expr { }
+  class ArrayExpr extends Synth::TArrayExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "ArrayExpr" }
+
+    /**
+     * Gets the `index`th attr of this array expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertArrayExprToRaw(this).(Raw::ArrayExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this array expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this array expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th expression of this array expression (0-based).
+     */
+    Expr getExpr(int index) {
+      result =
+        Synth::convertExprFromRaw(Synth::convertArrayExprToRaw(this).(Raw::ArrayExpr).getExpr(index))
+    }
+
+    /**
+     * Gets any of the expressions of this array expression.
+     */
+    final Expr getAnExpr() { result = this.getExpr(_) }
+
+    /**
+     * Gets the number of expressions of this array expression.
+     */
+    final int getNumberOfExprs() { result = count(int i | exists(this.getExpr(i))) }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll
new file mode 100644
index 0000000000000..7079c5e824467
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll
@@ -0,0 +1,53 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ArrayType`.
+ * 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.ConstArg
+import codeql.rust.elements.Type
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ArrayType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ArrayType` class directly.
+   * Use the subclass `ArrayType`, where the following predicates are available.
+   */
+  class ArrayType extends Synth::TArrayType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "ArrayType" }
+
+    /**
+     * Gets the const argument of this array type, if it exists.
+     */
+    ConstArg getConstArg() {
+      result =
+        Synth::convertConstArgFromRaw(Synth::convertArrayTypeToRaw(this)
+              .(Raw::ArrayType)
+              .getConstArg())
+    }
+
+    /**
+     * Holds if `getConstArg()` exists.
+     */
+    final predicate hasConstArg() { exists(this.getConstArg()) }
+
+    /**
+     * Gets the ty of this array type, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertArrayTypeToRaw(this).(Raw::ArrayType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
index 5710538b2da73..6a4c7e9f43b72 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,12 +16,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * An inline assembly expression. For example:
-   * ```
-   * unsafe {
-   *     builtin # asm(_);
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::AsmExpr` class directly.
    * Use the subclass `AsmExpr`, where the following predicates are available.
    */
@@ -28,10 +23,33 @@ module Generated {
     override string getAPrimaryQlClass() { result = "AsmExpr" }
 
     /**
-     * Gets the expression of this asm expression.
+     * Gets the `index`th attr of this asm expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertAsmExprToRaw(this).(Raw::AsmExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this asm expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this asm expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this asm expression, if it exists.
      */
     Expr getExpr() {
       result = Synth::convertExprFromRaw(Synth::convertAsmExprToRaw(this).(Raw::AsmExpr).getExpr())
     }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItem.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItem.qll
new file mode 100644
index 0000000000000..1789ede2b2757
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItem.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `AssocItem`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `AssocItem` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::AssocItem` class directly.
+   * Use the subclass `AssocItem`, where the following predicates are available.
+   */
+  class AssocItem extends Synth::TAssocItem, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll
new file mode 100644
index 0000000000000..6fe47b4205f4c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll
@@ -0,0 +1,65 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `AssocItemList`.
+ * 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.AssocItem
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `AssocItemList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::AssocItemList` class directly.
+   * Use the subclass `AssocItemList`, where the following predicates are available.
+   */
+  class AssocItemList extends Synth::TAssocItemList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "AssocItemList" }
+
+    /**
+     * Gets the `index`th assoc item of this assoc item list (0-based).
+     */
+    AssocItem getAssocItem(int index) {
+      result =
+        Synth::convertAssocItemFromRaw(Synth::convertAssocItemListToRaw(this)
+              .(Raw::AssocItemList)
+              .getAssocItem(index))
+    }
+
+    /**
+     * Gets any of the assoc items of this assoc item list.
+     */
+    final AssocItem getAnAssocItem() { result = this.getAssocItem(_) }
+
+    /**
+     * Gets the number of assoc items of this assoc item list.
+     */
+    final int getNumberOfAssocItems() { result = count(int i | exists(this.getAssocItem(i))) }
+
+    /**
+     * Gets the `index`th attr of this assoc item list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertAssocItemListToRaw(this)
+              .(Raw::AssocItemList)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this assoc item list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this assoc item list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
new file mode 100644
index 0000000000000..100acf9190399
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
@@ -0,0 +1,149 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `AssocTypeArg`.
+ * 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.ConstArg
+import codeql.rust.elements.internal.GenericArgImpl::Impl as GenericArgImpl
+import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
+import codeql.rust.elements.ReturnTypeSyntax
+import codeql.rust.elements.Type
+import codeql.rust.elements.TypeBoundList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `AssocTypeArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::AssocTypeArg` class directly.
+   * Use the subclass `AssocTypeArg`, where the following predicates are available.
+   */
+  class AssocTypeArg extends Synth::TAssocTypeArg, GenericArgImpl::GenericArg {
+    override string getAPrimaryQlClass() { result = "AssocTypeArg" }
+
+    /**
+     * Gets the const argument of this assoc type argument, if it exists.
+     */
+    ConstArg getConstArg() {
+      result =
+        Synth::convertConstArgFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getConstArg())
+    }
+
+    /**
+     * Holds if `getConstArg()` exists.
+     */
+    final predicate hasConstArg() { exists(this.getConstArg()) }
+
+    /**
+     * Gets the generic argument list of this assoc type argument, if it exists.
+     */
+    GenericArgList getGenericArgList() {
+      result =
+        Synth::convertGenericArgListFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getGenericArgList())
+    }
+
+    /**
+     * Holds if `getGenericArgList()` exists.
+     */
+    final predicate hasGenericArgList() { exists(this.getGenericArgList()) }
+
+    /**
+     * Gets the name reference of this assoc type argument, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
+
+    /**
+     * Gets the parameter list of this assoc type argument, if it exists.
+     */
+    ParamList getParamList() {
+      result =
+        Synth::convertParamListFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getParamList())
+    }
+
+    /**
+     * Holds if `getParamList()` exists.
+     */
+    final predicate hasParamList() { exists(this.getParamList()) }
+
+    /**
+     * Gets the ret type of this assoc type argument, if it exists.
+     */
+    RetType getRetType() {
+      result =
+        Synth::convertRetTypeFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getRetType())
+    }
+
+    /**
+     * Holds if `getRetType()` exists.
+     */
+    final predicate hasRetType() { exists(this.getRetType()) }
+
+    /**
+     * Gets the return type syntax of this assoc type argument, if it exists.
+     */
+    ReturnTypeSyntax getReturnTypeSyntax() {
+      result =
+        Synth::convertReturnTypeSyntaxFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getReturnTypeSyntax())
+    }
+
+    /**
+     * Holds if `getReturnTypeSyntax()` exists.
+     */
+    final predicate hasReturnTypeSyntax() { exists(this.getReturnTypeSyntax()) }
+
+    /**
+     * Gets the ty of this assoc type argument, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertAssocTypeArgToRaw(this).(Raw::AssocTypeArg).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the type bound list of this assoc type argument, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertAssocTypeArgToRaw(this)
+              .(Raw::AssocTypeArg)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsyncBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsyncBlockExpr.qll
deleted file mode 100644
index dea84a1a16023..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsyncBlockExpr.qll
+++ /dev/null
@@ -1,30 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `AsyncBlockExpr`.
- * 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.BlockExprBaseImpl::Impl as BlockExprBaseImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `AsyncBlockExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * An async block expression. For example:
-   * ```
-   * async {
-   *    let x = 42;
-   *    x
-   * }.await
-   * ```
-   * INTERNAL: Do not reference the `Generated::AsyncBlockExpr` class directly.
-   * Use the subclass `AsyncBlockExpr`, where the following predicates are available.
-   */
-  class AsyncBlockExpr extends Synth::TAsyncBlockExpr, BlockExprBaseImpl::BlockExprBase {
-    override string getAPrimaryQlClass() { result = "AsyncBlockExpr" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Attr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Attr.qll
new file mode 100644
index 0000000000000..55207effe44b8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Attr.qll
@@ -0,0 +1,36 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Attr`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Meta
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Attr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Attr` class directly.
+   * Use the subclass `Attr`, where the following predicates are available.
+   */
+  class Attr extends Synth::TAttr, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Attr" }
+
+    /**
+     * Gets the meta of this attr, if it exists.
+     */
+    Meta getMeta() {
+      result = Synth::convertMetaFromRaw(Synth::convertAttrToRaw(this).(Raw::Attr).getMeta())
+    }
+
+    /**
+     * Holds if `getMeta()` exists.
+     */
+    final predicate hasMeta() { exists(this.getMeta()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll
index 42934f2b8839e..a4cec30526f2e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AwaitExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,13 +16,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * An `await` expression. For example:
-   * ```
-   * async {
-   *     let x = foo().await;
-   *     x
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::AwaitExpr` class directly.
    * Use the subclass `AwaitExpr`, where the following predicates are available.
    */
@@ -29,11 +23,34 @@ module Generated {
     override string getAPrimaryQlClass() { result = "AwaitExpr" }
 
     /**
-     * Gets the expression of this await expression.
+     * Gets the `index`th attr of this await expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertAwaitExprToRaw(this).(Raw::AwaitExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this await expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this await expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this await expression, if it exists.
      */
     Expr getExpr() {
       result =
         Synth::convertExprFromRaw(Synth::convertAwaitExprToRaw(this).(Raw::AwaitExpr).getExpr())
     }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll
index 59741898769d4..d098a75bd5016 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BecomeExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,15 +16,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * A `become` expression. For example:
-   * ```
-   * fn fact_a(n: i32, a: i32) -> i32 {
-   *      if n == 0 {
-   *          a
-   *      } else {
-   *          become fact_a(n - 1, n * a)
-   *      }
-   *  }    ```
    * INTERNAL: Do not reference the `Generated::BecomeExpr` class directly.
    * Use the subclass `BecomeExpr`, where the following predicates are available.
    */
@@ -31,11 +23,36 @@ module Generated {
     override string getAPrimaryQlClass() { result = "BecomeExpr" }
 
     /**
-     * Gets the expression of this become expression.
+     * Gets the `index`th attr of this become expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertBecomeExprToRaw(this)
+              .(Raw::BecomeExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this become expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this become expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this become expression, if it exists.
      */
     Expr getExpr() {
       result =
         Synth::convertExprFromRaw(Synth::convertBecomeExprToRaw(this).(Raw::BecomeExpr).getExpr())
     }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll
index bea4447c42646..a07e177ab3df9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BinaryExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,14 +16,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * A binary operation expression. For example:
-   * ```
-   * x + y;
-   * x && y;
-   * x <= y;
-   * x = y;
-   * x += y;
-   * ```
    * INTERNAL: Do not reference the `Generated::BinaryExpr` class directly.
    * Use the subclass `BinaryExpr`, where the following predicates are available.
    */
@@ -30,7 +23,27 @@ module Generated {
     override string getAPrimaryQlClass() { result = "BinaryExpr" }
 
     /**
-     * Gets the lhs of this binary expression.
+     * Gets the `index`th attr of this binary expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertBinaryExprToRaw(this)
+              .(Raw::BinaryExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this binary expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this binary expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the lhs of this binary expression, if it exists.
      */
     Expr getLhs() {
       result =
@@ -38,7 +51,12 @@ module Generated {
     }
 
     /**
-     * Gets the rhs of this binary expression.
+     * Holds if `getLhs()` exists.
+     */
+    final predicate hasLhs() { exists(this.getLhs()) }
+
+    /**
+     * Gets the rhs of this binary expression, if it exists.
      */
     Expr getRhs() {
       result =
@@ -46,13 +64,8 @@ module Generated {
     }
 
     /**
-     * Gets the op of this binary expression, if it exists.
-     */
-    string getOp() { result = Synth::convertBinaryExprToRaw(this).(Raw::BinaryExpr).getOp() }
-
-    /**
-     * Holds if `getOp()` exists.
+     * Holds if `getRhs()` exists.
      */
-    final predicate hasOp() { exists(this.getOp()) }
+    final predicate hasRhs() { exists(this.getRhs()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
index f7821915508f5..5d6f943d4a00f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
@@ -6,8 +6,10 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.BlockExprBaseImpl::Impl as BlockExprBaseImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Label
+import codeql.rust.elements.StmtList
 
 /**
  * INTERNAL: This module contains the fully generated definition of `BlockExpr` and should not
@@ -15,24 +17,30 @@ import codeql.rust.elements.Label
  */
 module Generated {
   /**
-   * A block expression. For example:
-   * ```
-   * {
-   *     let x = 42;
-   * }
-   * ```
-   * ```
-   * 'label: {
-   *     let x = 42;
-   *     x
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::BlockExpr` class directly.
    * Use the subclass `BlockExpr`, where the following predicates are available.
    */
-  class BlockExpr extends Synth::TBlockExpr, BlockExprBaseImpl::BlockExprBase {
+  class BlockExpr extends Synth::TBlockExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "BlockExpr" }
 
+    /**
+     * Gets the `index`th attr of this block expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this block expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this block expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the label of this block expression, if it exists.
      */
@@ -45,5 +53,20 @@ module Generated {
      * Holds if `getLabel()` exists.
      */
     final predicate hasLabel() { exists(this.getLabel()) }
+
+    /**
+     * Gets the statement list of this block expression, if it exists.
+     */
+    StmtList getStmtList() {
+      result =
+        Synth::convertStmtListFromRaw(Synth::convertBlockExprToRaw(this)
+              .(Raw::BlockExpr)
+              .getStmtList())
+    }
+
+    /**
+     * Holds if `getStmtList()` exists.
+     */
+    final predicate hasStmtList() { exists(this.getStmtList()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExprBase.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExprBase.qll
deleted file mode 100644
index 74c5ba6575fab..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExprBase.qll
+++ /dev/null
@@ -1,58 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `BlockExprBase`.
- * 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.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Stmt
-
-/**
- * INTERNAL: This module contains the fully generated definition of `BlockExprBase` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * INTERNAL: Do not reference the `Generated::BlockExprBase` class directly.
-   * Use the subclass `BlockExprBase`, where the following predicates are available.
-   */
-  class BlockExprBase extends Synth::TBlockExprBase, ExprImpl::Expr {
-    /**
-     * Gets the `index`th statement of this block expression base (0-based).
-     */
-    Stmt getStatement(int index) {
-      result =
-        Synth::convertStmtFromRaw(Synth::convertBlockExprBaseToRaw(this)
-              .(Raw::BlockExprBase)
-              .getStatement(index))
-    }
-
-    /**
-     * Gets any of the statements of this block expression base.
-     */
-    final Stmt getAStatement() { result = this.getStatement(_) }
-
-    /**
-     * Gets the number of statements of this block expression base.
-     */
-    final int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
-
-    /**
-     * Gets the tail of this block expression base, if it exists.
-     */
-    Expr getTail() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertBlockExprBaseToRaw(this)
-              .(Raw::BlockExprBase)
-              .getTail())
-    }
-
-    /**
-     * Holds if `getTail()` exists.
-     */
-    final predicate hasTail() { exists(this.getTail()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BoxExpr.qll
deleted file mode 100644
index 4152250316f86..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxExpr.qll
+++ /dev/null
@@ -1,35 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `BoxExpr`.
- * 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.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `BoxExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A box expression. For example:
-   * ```
-   * let x = #[rustc_box] Box::new(42);
-   * ```
-   * INTERNAL: Do not reference the `Generated::BoxExpr` class directly.
-   * Use the subclass `BoxExpr`, where the following predicates are available.
-   */
-  class BoxExpr extends Synth::TBoxExpr, ExprImpl::Expr {
-    override string getAPrimaryQlClass() { result = "BoxExpr" }
-
-    /**
-     * Gets the expression of this box expression.
-     */
-    Expr getExpr() {
-      result = Synth::convertExprFromRaw(Synth::convertBoxExprToRaw(this).(Raw::BoxExpr).getExpr())
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
index 5d31997b90746..2276e79d240ed 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
@@ -15,13 +15,6 @@ import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
  */
 module Generated {
   /**
-   * A box pattern. For example:
-   * ```
-   * match x {
-   *     box Option::Some(y) => y,
-   *     box Option::None => 0,
-   * };
-   * ```
    * INTERNAL: Do not reference the `Generated::BoxPat` class directly.
    * Use the subclass `BoxPat`, where the following predicates are available.
    */
@@ -29,10 +22,15 @@ module Generated {
     override string getAPrimaryQlClass() { result = "BoxPat" }
 
     /**
-     * Gets the inner of this box pat.
+     * Gets the pat of this box pat, if it exists.
      */
-    Pat getInner() {
-      result = Synth::convertPatFromRaw(Synth::convertBoxPatToRaw(this).(Raw::BoxPat).getInner())
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertBoxPatToRaw(this).(Raw::BoxPat).getPat())
     }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll
index 913c56c7df2ae..0ad86db849182 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll
@@ -6,9 +6,10 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Label
+import codeql.rust.elements.Lifetime
 
 /**
  * INTERNAL: This module contains the fully generated definition of `BreakExpr` and should not
@@ -16,27 +17,30 @@ import codeql.rust.elements.Label
  */
 module Generated {
   /**
-   * A break expression. For example:
-   * ```
-   * loop {
-   *     if not_ready() {
-   *         break;
-   *      }
-   * }
-   * ```
-   * ```
-   * let x = 'label: loop {
-   *     if done() {
-   *         break 'label 42;
-   *     }
-   * };
-   * ```
    * INTERNAL: Do not reference the `Generated::BreakExpr` class directly.
    * Use the subclass `BreakExpr`, where the following predicates are available.
    */
   class BreakExpr extends Synth::TBreakExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "BreakExpr" }
 
+    /**
+     * Gets the `index`th attr of this break expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertBreakExprToRaw(this).(Raw::BreakExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this break expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this break expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the expression of this break expression, if it exists.
      */
@@ -51,16 +55,18 @@ module Generated {
     final predicate hasExpr() { exists(this.getExpr()) }
 
     /**
-     * Gets the label of this break expression, if it exists.
+     * Gets the lifetime of this break expression, if it exists.
      */
-    Label getLabel() {
+    Lifetime getLifetime() {
       result =
-        Synth::convertLabelFromRaw(Synth::convertBreakExprToRaw(this).(Raw::BreakExpr).getLabel())
+        Synth::convertLifetimeFromRaw(Synth::convertBreakExprToRaw(this)
+              .(Raw::BreakExpr)
+              .getLifetime())
     }
 
     /**
-     * Holds if `getLabel()` exists.
+     * Holds if `getLifetime()` exists.
      */
-    final predicate hasLabel() { exists(this.getLabel()) }
+    final predicate hasLifetime() { exists(this.getLifetime()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
index 3598710a10429..97f5e2be87397 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
@@ -6,6 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.ArgList
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,13 +17,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * A function call expression. For example:
-   * ```
-   * foo(42);
-   * foo::<u32, u64>(42);
-   * foo[0](42);
-   * foo(1) = 4;
-   * ```
    * INTERNAL: Do not reference the `Generated::CallExpr` class directly.
    * Use the subclass `CallExpr`, where the following predicates are available.
    */
@@ -29,36 +24,47 @@ module Generated {
     override string getAPrimaryQlClass() { result = "CallExpr" }
 
     /**
-     * Gets the callee of this call expression.
+     * Gets the argument list of this call expression, if it exists.
      */
-    Expr getCallee() {
+    ArgList getArgList() {
       result =
-        Synth::convertExprFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getCallee())
+        Synth::convertArgListFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getArgList())
     }
 
     /**
-     * Gets the `index`th argument of this call expression (0-based).
+     * Holds if `getArgList()` exists.
      */
-    Expr getArg(int index) {
+    final predicate hasArgList() { exists(this.getArgList()) }
+
+    /**
+     * Gets the `index`th attr of this call expression (0-based).
+     */
+    Attr getAttr(int index) {
       result =
-        Synth::convertExprFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getArg(index))
+        Synth::convertAttrFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getAttr(index))
     }
 
     /**
-     * Gets any of the arguments of this call expression.
+     * Gets any of the attrs of this call expression.
      */
-    final Expr getAnArg() { result = this.getArg(_) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of arguments of this call expression.
+     * Gets the number of attrs of this call expression.
      */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Holds if this call expression is assignee expression.
+     * Gets the expression of this call expression, if it exists.
      */
-    predicate isAssigneeExpr() {
-      Synth::convertCallExprToRaw(this).(Raw::CallExpr).isAssigneeExpr()
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getExpr())
     }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
index 618276ed38ea9..712237bd80650 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
@@ -6,9 +6,10 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Type
 
 /**
  * INTERNAL: This module contains the fully generated definition of `CastExpr` and should not
@@ -16,10 +17,6 @@ import codeql.rust.elements.TypeRef
  */
 module Generated {
   /**
-   * A cast expression. For example:
-   * ```
-   * value as u64;
-   * ```
    * INTERNAL: Do not reference the `Generated::CastExpr` class directly.
    * Use the subclass `CastExpr`, where the following predicates are available.
    */
@@ -27,7 +24,25 @@ module Generated {
     override string getAPrimaryQlClass() { result = "CastExpr" }
 
     /**
-     * Gets the expression of this cast expression.
+     * Gets the `index`th attr of this cast expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this cast expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this cast expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this cast expression, if it exists.
      */
     Expr getExpr() {
       result =
@@ -35,11 +50,20 @@ module Generated {
     }
 
     /**
-     * Gets the type of this cast expression.
+     * Holds if `getExpr()` exists.
      */
-    TypeRef getType() {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getType())
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the ty of this cast expression, if it exists.
+     */
+    Type getTy() {
+      result = Synth::convertTypeFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getTy())
     }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll
new file mode 100644
index 0000000000000..61938ab3d8454
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll
@@ -0,0 +1,39 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ClosureBinder`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.GenericParamList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ClosureBinder` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ClosureBinder` class directly.
+   * Use the subclass `ClosureBinder`, where the following predicates are available.
+   */
+  class ClosureBinder extends Synth::TClosureBinder, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ClosureBinder" }
+
+    /**
+     * Gets the generic parameter list of this closure binder, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertClosureBinderToRaw(this)
+              .(Raw::ClosureBinder)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
index 79ece760ca5b7..c9f5af374864c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
@@ -6,10 +6,12 @@
 
 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.ClosureBinder
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Pat
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
 
 /**
  * INTERNAL: This module contains the fully generated definition of `ClosureExpr` and should not
@@ -17,16 +19,6 @@ import codeql.rust.elements.TypeRef
  */
 module Generated {
   /**
-   * A closure expression. For example:
-   * ```
-   * |x| x + 1;
-   * move |x: i32| -> i32 { x + 1 };
-   * async |x: i32, y| x + y;
-   *  #[coroutine]
-   * |x| yield x;
-   *  #[coroutine]
-   *  static |x| yield x;
-   * ```
    * INTERNAL: Do not reference the `Generated::ClosureExpr` class directly.
    * Use the subclass `ClosureExpr`, where the following predicates are available.
    */
@@ -34,78 +26,81 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ClosureExpr" }
 
     /**
-     * Gets the `index`th argument of this closure expression (0-based).
+     * Gets the `index`th attr of this closure expression (0-based).
      */
-    Pat getArg(int index) {
+    Attr getAttr(int index) {
       result =
-        Synth::convertPatFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertAttrFromRaw(Synth::convertClosureExprToRaw(this)
               .(Raw::ClosureExpr)
-              .getArg(index))
+              .getAttr(index))
     }
 
     /**
-     * Gets any of the arguments of this closure expression.
+     * Gets any of the attrs of this closure expression.
      */
-    final Pat getAnArg() { result = this.getArg(_) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of arguments of this closure expression.
+     * Gets the number of attrs of this closure expression.
      */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the `index`th argument type of this closure expression (0-based), if it exists.
+     * Gets the body of this closure expression, if it exists.
      */
-    TypeRef getArgType(int index) {
+    Expr getBody() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertClosureExprToRaw(this)
-              .(Raw::ClosureExpr)
-              .getArgType(index))
+        Synth::convertExprFromRaw(Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).getBody())
     }
 
     /**
-     * Holds if `getArgType(index)` exists.
+     * Holds if `getBody()` exists.
      */
-    final predicate hasArgType(int index) { exists(this.getArgType(index)) }
+    final predicate hasBody() { exists(this.getBody()) }
 
     /**
-     * Gets any of the argument types of this closure expression.
+     * Gets the closure binder of this closure expression, if it exists.
      */
-    final TypeRef getAnArgType() { result = this.getArgType(_) }
-
-    /**
-     * Gets the ret type of this closure expression, if it exists.
-     */
-    TypeRef getRetType() {
+    ClosureBinder getClosureBinder() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertClosureBinderFromRaw(Synth::convertClosureExprToRaw(this)
               .(Raw::ClosureExpr)
-              .getRetType())
+              .getClosureBinder())
     }
 
     /**
-     * Holds if `getRetType()` exists.
+     * Holds if `getClosureBinder()` exists.
      */
-    final predicate hasRetType() { exists(this.getRetType()) }
+    final predicate hasClosureBinder() { exists(this.getClosureBinder()) }
 
     /**
-     * Gets the body of this closure expression.
+     * Gets the parameter list of this closure expression, if it exists.
      */
-    Expr getBody() {
+    ParamList getParamList() {
       result =
-        Synth::convertExprFromRaw(Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).getBody())
+        Synth::convertParamListFromRaw(Synth::convertClosureExprToRaw(this)
+              .(Raw::ClosureExpr)
+              .getParamList())
     }
 
     /**
-     * Gets the closure kind of this closure expression.
+     * Holds if `getParamList()` exists.
+     */
+    final predicate hasParamList() { exists(this.getParamList()) }
+
+    /**
+     * Gets the ret type of this closure expression, if it exists.
      */
-    string getClosureKind() {
-      result = Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).getClosureKind()
+    RetType getRetType() {
+      result =
+        Synth::convertRetTypeFromRaw(Synth::convertClosureExprToRaw(this)
+              .(Raw::ClosureExpr)
+              .getRetType())
     }
 
     /**
-     * Holds if this closure expression is move.
+     * Holds if `getRetType()` exists.
      */
-    predicate isMove() { Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).isMove() }
+    final predicate hasRetType() { exists(this.getRetType()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
new file mode 100644
index 0000000000000..b634052a803f8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
@@ -0,0 +1,95 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Const`.
+ * 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.AssocItemImpl::Impl as AssocItemImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Const` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Const` class directly.
+   * Use the subclass `Const`, where the following predicates are available.
+   */
+  class Const extends Synth::TConst, AssocItemImpl::AssocItem, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Const" }
+
+    /**
+     * Gets the `index`th attr of this const (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this const.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this const.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the body of this const, if it exists.
+     */
+    Expr getBody() {
+      result = Synth::convertExprFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getBody())
+    }
+
+    /**
+     * Holds if `getBody()` exists.
+     */
+    final predicate hasBody() { exists(this.getBody()) }
+
+    /**
+     * Gets the name of this const, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this const, if it exists.
+     */
+    Type getTy() {
+      result = Synth::convertTypeFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the visibility of this const, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstArg.qll
new file mode 100644
index 0000000000000..5fc43e76704f0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstArg.qll
@@ -0,0 +1,37 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ConstArg`.
+ * 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.Expr
+import codeql.rust.elements.internal.GenericArgImpl::Impl as GenericArgImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ConstArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ConstArg` class directly.
+   * Use the subclass `ConstArg`, where the following predicates are available.
+   */
+  class ConstArg extends Synth::TConstArg, GenericArgImpl::GenericArg {
+    override string getAPrimaryQlClass() { result = "ConstArg" }
+
+    /**
+     * Gets the expression of this const argument, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertConstArgToRaw(this).(Raw::ConstArg).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
index 460bd6645eb50..fe51ed000c234 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
+import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
 
 /**
@@ -15,13 +15,6 @@ import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
  */
 module Generated {
   /**
-   * A const block pattern. For example:
-   * ```
-   * match x {
-   *     const { 1 + 2 + 3 } => "ok",
-   *     _ => "fail",
-   * };
-   * ```
    * INTERNAL: Do not reference the `Generated::ConstBlockPat` class directly.
    * Use the subclass `ConstBlockPat`, where the following predicates are available.
    */
@@ -29,13 +22,18 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ConstBlockPat" }
 
     /**
-     * Gets the expression of this const block pat.
+     * Gets the block expression of this const block pat, if it exists.
      */
-    Expr getExpr() {
+    BlockExpr getBlockExpr() {
       result =
-        Synth::convertExprFromRaw(Synth::convertConstBlockPatToRaw(this)
+        Synth::convertBlockExprFromRaw(Synth::convertConstBlockPatToRaw(this)
               .(Raw::ConstBlockPat)
-              .getExpr())
+              .getBlockExpr())
     }
+
+    /**
+     * Holds if `getBlockExpr()` exists.
+     */
+    final predicate hasBlockExpr() { exists(this.getBlockExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstExpr.qll
deleted file mode 100644
index e093d101b1e5e..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstExpr.qll
+++ /dev/null
@@ -1,38 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ConstExpr`.
- * 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.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ConstExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A `const` block expression. For example:
-   * ```
-   * if const { SRC::IS_ZST || DEST::IS_ZST || mem::align_of::<SRC>() != mem::align_of::<DEST>() } {
-   *     return false;
-   * }
-   * ```
-   * INTERNAL: Do not reference the `Generated::ConstExpr` class directly.
-   * Use the subclass `ConstExpr`, where the following predicates are available.
-   */
-  class ConstExpr extends Synth::TConstExpr, ExprImpl::Expr {
-    override string getAPrimaryQlClass() { result = "ConstExpr" }
-
-    /**
-     * Gets the expression of this const expression.
-     */
-    Expr getExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertConstExprToRaw(this).(Raw::ConstExpr).getExpr())
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
new file mode 100644
index 0000000000000..bcff78f4ccead
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
@@ -0,0 +1,88 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ConstParam`.
+ * 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.ConstArg
+import codeql.rust.elements.internal.GenericParamImpl::Impl as GenericParamImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ConstParam` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ConstParam` class directly.
+   * Use the subclass `ConstParam`, where the following predicates are available.
+   */
+  class ConstParam extends Synth::TConstParam, GenericParamImpl::GenericParam {
+    override string getAPrimaryQlClass() { result = "ConstParam" }
+
+    /**
+     * Gets the `index`th attr of this const parameter (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertConstParamToRaw(this)
+              .(Raw::ConstParam)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this const parameter.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this const parameter.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the default val of this const parameter, if it exists.
+     */
+    ConstArg getDefaultVal() {
+      result =
+        Synth::convertConstArgFromRaw(Synth::convertConstParamToRaw(this)
+              .(Raw::ConstParam)
+              .getDefaultVal())
+    }
+
+    /**
+     * Holds if `getDefaultVal()` exists.
+     */
+    final predicate hasDefaultVal() { exists(this.getDefaultVal()) }
+
+    /**
+     * Gets the name of this const parameter, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertConstParamToRaw(this).(Raw::ConstParam).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this const parameter, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertConstParamToRaw(this).(Raw::ConstParam).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll
index b222b911d2e7a..a0de0203edef2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ContinueExpr.qll
@@ -6,8 +6,9 @@
 
 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.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Label
+import codeql.rust.elements.Lifetime
 
 /**
  * INTERNAL: This module contains the fully generated definition of `ContinueExpr` and should not
@@ -15,21 +16,6 @@ import codeql.rust.elements.Label
  */
 module Generated {
   /**
-   * A continue expression. For example:
-   * ```
-   * loop {
-   *     if not_ready() {
-   *         continue;
-   *     }
-   * }
-   * ```
-   * ```
-   * 'label: loop {
-   *     if not_ready() {
-   *         continue 'label;
-   *     }
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::ContinueExpr` class directly.
    * Use the subclass `ContinueExpr`, where the following predicates are available.
    */
@@ -37,18 +23,38 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ContinueExpr" }
 
     /**
-     * Gets the label of this continue expression, if it exists.
+     * Gets the `index`th attr of this continue expression (0-based).
      */
-    Label getLabel() {
+    Attr getAttr(int index) {
       result =
-        Synth::convertLabelFromRaw(Synth::convertContinueExprToRaw(this)
+        Synth::convertAttrFromRaw(Synth::convertContinueExprToRaw(this)
               .(Raw::ContinueExpr)
-              .getLabel())
+              .getAttr(index))
     }
 
     /**
-     * Holds if `getLabel()` exists.
+     * Gets any of the attrs of this continue expression.
      */
-    final predicate hasLabel() { exists(this.getLabel()) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this continue expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the lifetime of this continue expression, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertContinueExprToRaw(this)
+              .(Raw::ContinueExpr)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Declaration.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Declaration.qll
deleted file mode 100644
index 0809fcb4dc854..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Declaration.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `Declaration`.
- * 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.AstNodeImpl::Impl as AstNodeImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `Declaration` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * The base class for declarations.
-   * INTERNAL: Do not reference the `Generated::Declaration` class directly.
-   * Use the subclass `Declaration`, where the following predicates are available.
-   */
-  class Declaration extends Synth::TDeclaration, AstNodeImpl::AstNode { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll
new file mode 100644
index 0000000000000..b6b27a332e864
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll
@@ -0,0 +1,39 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `DynTraitType`.
+ * 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.TypeBoundList
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `DynTraitType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::DynTraitType` class directly.
+   * Use the subclass `DynTraitType`, where the following predicates are available.
+   */
+  class DynTraitType extends Synth::TDynTraitType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "DynTraitType" }
+
+    /**
+     * Gets the type bound list of this dyn trait type, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertDynTraitTypeToRaw(this)
+              .(Raw::DynTraitType)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ElementListExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ElementListExpr.qll
deleted file mode 100644
index 2ebc29e46f2c8..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ElementListExpr.qll
+++ /dev/null
@@ -1,56 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ElementListExpr`.
- * 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.ArrayExprImpl::Impl as ArrayExprImpl
-import codeql.rust.elements.Expr
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ElementListExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * An element list expression. For example:
-   * ```
-   * [1, 2, 3, 4, 5];
-   * [1, 2, 3, 4, 5][0] = 6;
-   * ```
-   * INTERNAL: Do not reference the `Generated::ElementListExpr` class directly.
-   * Use the subclass `ElementListExpr`, where the following predicates are available.
-   */
-  class ElementListExpr extends Synth::TElementListExpr, ArrayExprImpl::ArrayExpr {
-    override string getAPrimaryQlClass() { result = "ElementListExpr" }
-
-    /**
-     * Gets the `index`th element of this element list expression (0-based).
-     */
-    Expr getElement(int index) {
-      result =
-        Synth::convertExprFromRaw(Synth::convertElementListExprToRaw(this)
-              .(Raw::ElementListExpr)
-              .getElement(index))
-    }
-
-    /**
-     * Gets any of the elements of this element list expression.
-     */
-    final Expr getAnElement() { result = this.getElement(_) }
-
-    /**
-     * Gets the number of elements of this element list expression.
-     */
-    final int getNumberOfElements() { result = count(int i | exists(this.getElement(i))) }
-
-    /**
-     * Holds if this element list expression is assignee expression.
-     */
-    predicate isAssigneeExpr() {
-      Synth::convertElementListExprToRaw(this).(Raw::ElementListExpr).isAssigneeExpr()
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Enum.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Enum.qll
new file mode 100644
index 0000000000000..ce0de29f4624a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Enum.qll
@@ -0,0 +1,113 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Enum`.
+ * 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.AdtImpl::Impl as AdtImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+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
+ * be referenced directly.
+ */
+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, ItemImpl::Item {
+    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.
+     */
+    VariantList getVariantList() {
+      result =
+        Synth::convertVariantListFromRaw(Synth::convertEnumToRaw(this).(Raw::Enum).getVariantList())
+    }
+
+    /**
+     * 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/Expr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Expr.qll
index f8cec88775155..7cefa1c9c20e9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Expr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Expr.qll
@@ -14,7 +14,6 @@ import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
  */
 module Generated {
   /**
-   * The base class for expressions.
    * INTERNAL: Do not reference the `Generated::Expr` class directly.
    * Use the subclass `Expr`, where the following predicates are available.
    */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll
index adb7740fcc011..50285c4ec683d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExprStmt.qll
@@ -15,12 +15,6 @@ import codeql.rust.elements.internal.StmtImpl::Impl as StmtImpl
  */
 module Generated {
   /**
-   * An expression statement. For example:
-   * ```
-   * start();
-   * finish()
-   * use std::env;
-   * ```
    * INTERNAL: Do not reference the `Generated::ExprStmt` class directly.
    * Use the subclass `ExprStmt`, where the following predicates are available.
    */
@@ -28,7 +22,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ExprStmt" }
 
     /**
-     * Gets the expression of this expression statement.
+     * Gets the expression of this expression statement, if it exists.
      */
     Expr getExpr() {
       result =
@@ -36,8 +30,8 @@ module Generated {
     }
 
     /**
-     * Holds if this expression statement has semicolon.
+     * Holds if `getExpr()` exists.
      */
-    predicate hasSemicolon() { Synth::convertExprStmtToRaw(this).(Raw::ExprStmt).hasSemicolon() }
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll
new file mode 100644
index 0000000000000..b6f1c8f01e9f4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternBlock.qll
@@ -0,0 +1,74 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ExternBlock`.
+ * 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.Abi
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItemList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ExternBlock` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ExternBlock` class directly.
+   * Use the subclass `ExternBlock`, where the following predicates are available.
+   */
+  class ExternBlock extends Synth::TExternBlock, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "ExternBlock" }
+
+    /**
+     * Gets the abi of this extern block, if it exists.
+     */
+    Abi getAbi() {
+      result =
+        Synth::convertAbiFromRaw(Synth::convertExternBlockToRaw(this).(Raw::ExternBlock).getAbi())
+    }
+
+    /**
+     * Holds if `getAbi()` exists.
+     */
+    final predicate hasAbi() { exists(this.getAbi()) }
+
+    /**
+     * Gets the `index`th attr of this extern block (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertExternBlockToRaw(this)
+              .(Raw::ExternBlock)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this extern block.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this extern block.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the extern item list of this extern block, if it exists.
+     */
+    ExternItemList getExternItemList() {
+      result =
+        Synth::convertExternItemListFromRaw(Synth::convertExternBlockToRaw(this)
+              .(Raw::ExternBlock)
+              .getExternItemList())
+    }
+
+    /**
+     * Holds if `getExternItemList()` exists.
+     */
+    final predicate hasExternItemList() { exists(this.getExternItemList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll
new file mode 100644
index 0000000000000..c8a8686ffbee4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternCrate.qll
@@ -0,0 +1,92 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ExternCrate`.
+ * 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.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.Rename
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ExternCrate` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ExternCrate` class directly.
+   * Use the subclass `ExternCrate`, where the following predicates are available.
+   */
+  class ExternCrate extends Synth::TExternCrate, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "ExternCrate" }
+
+    /**
+     * Gets the `index`th attr of this extern crate (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertExternCrateToRaw(this)
+              .(Raw::ExternCrate)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this extern crate.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this extern crate.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the name reference of this extern crate, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertExternCrateToRaw(this)
+              .(Raw::ExternCrate)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
+
+    /**
+     * Gets the rename of this extern crate, if it exists.
+     */
+    Rename getRename() {
+      result =
+        Synth::convertRenameFromRaw(Synth::convertExternCrateToRaw(this)
+              .(Raw::ExternCrate)
+              .getRename())
+    }
+
+    /**
+     * Holds if `getRename()` exists.
+     */
+    final predicate hasRename() { exists(this.getRename()) }
+
+    /**
+     * Gets the visibility of this extern crate, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertExternCrateToRaw(this)
+              .(Raw::ExternCrate)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItem.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItem.qll
new file mode 100644
index 0000000000000..7f75df3cbdffc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItem.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ExternItem`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ExternItem` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ExternItem` class directly.
+   * Use the subclass `ExternItem`, where the following predicates are available.
+   */
+  class ExternItem extends Synth::TExternItem, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItemList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItemList.qll
new file mode 100644
index 0000000000000..f4d9e85ab9f09
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExternItemList.qll
@@ -0,0 +1,65 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ExternItemList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.ExternItem
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ExternItemList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ExternItemList` class directly.
+   * Use the subclass `ExternItemList`, where the following predicates are available.
+   */
+  class ExternItemList extends Synth::TExternItemList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ExternItemList" }
+
+    /**
+     * Gets the `index`th attr of this extern item list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertExternItemListToRaw(this)
+              .(Raw::ExternItemList)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this extern item list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this extern item list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th extern item of this extern item list (0-based).
+     */
+    ExternItem getExternItem(int index) {
+      result =
+        Synth::convertExternItemFromRaw(Synth::convertExternItemListToRaw(this)
+              .(Raw::ExternItemList)
+              .getExternItem(index))
+    }
+
+    /**
+     * Gets any of the extern items of this extern item list.
+     */
+    final ExternItem getAnExternItem() { result = this.getExternItem(_) }
+
+    /**
+     * Gets the number of extern items of this extern item list.
+     */
+    final int getNumberOfExternItems() { result = count(int i | exists(this.getExternItem(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
index 8768525fd30f1..47574da92b1b1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldExpr.qll
@@ -6,8 +6,10 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.NameRef
 
 /**
  * INTERNAL: This module contains the fully generated definition of `FieldExpr` and should not
@@ -15,10 +17,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * A field access expression. For example:
-   * ```
-   * x.foo
-   * ```
    * INTERNAL: Do not reference the `Generated::FieldExpr` class directly.
    * Use the subclass `FieldExpr`, where the following predicates are available.
    */
@@ -26,7 +24,25 @@ module Generated {
     override string getAPrimaryQlClass() { result = "FieldExpr" }
 
     /**
-     * Gets the expression of this field expression.
+     * Gets the `index`th attr of this field expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertFieldExprToRaw(this).(Raw::FieldExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this field expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this field expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this field expression, if it exists.
      */
     Expr getExpr() {
       result =
@@ -34,8 +50,23 @@ module Generated {
     }
 
     /**
-     * Gets the name of this field expression.
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the name reference of this field expression, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertFieldExprToRaw(this)
+              .(Raw::FieldExpr)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
      */
-    string getName() { result = Synth::convertFieldExprToRaw(this).(Raw::FieldExpr).getName() }
+    final predicate hasNameRef() { exists(this.getNameRef()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldList.qll
new file mode 100644
index 0000000000000..fdf7bbbf0857a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FieldList.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FieldList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::FieldList` class directly.
+   * Use the subclass `FieldList`, where the following predicates are available.
+   */
+  class FieldList extends Synth::TFieldList, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Fn.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Fn.qll
new file mode 100644
index 0000000000000..7186a3835b8d2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Fn.qll
@@ -0,0 +1,152 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Fn`.
+ * 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.Abi
+import codeql.rust.elements.internal.AssocItemImpl::Impl as AssocItemImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Fn` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Fn` class directly.
+   * Use the subclass `Fn`, where the following predicates are available.
+   */
+  class Fn extends Synth::TFn, AssocItemImpl::AssocItem, ExternItemImpl::ExternItem, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Fn" }
+
+    /**
+     * Gets the abi of this fn, if it exists.
+     */
+    Abi getAbi() {
+      result = Synth::convertAbiFromRaw(Synth::convertFnToRaw(this).(Raw::Fn).getAbi())
+    }
+
+    /**
+     * Holds if `getAbi()` exists.
+     */
+    final predicate hasAbi() { exists(this.getAbi()) }
+
+    /**
+     * Gets the `index`th attr of this fn (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertFnToRaw(this).(Raw::Fn).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this fn.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this fn.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the body of this fn, if it exists.
+     */
+    BlockExpr getBody() {
+      result = Synth::convertBlockExprFromRaw(Synth::convertFnToRaw(this).(Raw::Fn).getBody())
+    }
+
+    /**
+     * Holds if `getBody()` exists.
+     */
+    final predicate hasBody() { exists(this.getBody()) }
+
+    /**
+     * Gets the generic parameter list of this fn, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertFnToRaw(this)
+              .(Raw::Fn)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the name of this fn, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertFnToRaw(this).(Raw::Fn).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the parameter list of this fn, if it exists.
+     */
+    ParamList getParamList() {
+      result = Synth::convertParamListFromRaw(Synth::convertFnToRaw(this).(Raw::Fn).getParamList())
+    }
+
+    /**
+     * Holds if `getParamList()` exists.
+     */
+    final predicate hasParamList() { exists(this.getParamList()) }
+
+    /**
+     * Gets the ret type of this fn, if it exists.
+     */
+    RetType getRetType() {
+      result = Synth::convertRetTypeFromRaw(Synth::convertFnToRaw(this).(Raw::Fn).getRetType())
+    }
+
+    /**
+     * Holds if `getRetType()` exists.
+     */
+    final predicate hasRetType() { exists(this.getRetType()) }
+
+    /**
+     * Gets the visibility of this fn, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertFnToRaw(this).(Raw::Fn).getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this fn, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertFnToRaw(this).(Raw::Fn).getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll
new file mode 100644
index 0000000000000..310badc750036
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll
@@ -0,0 +1,69 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FnPtrType`.
+ * 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.Abi
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetType
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FnPtrType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::FnPtrType` class directly.
+   * Use the subclass `FnPtrType`, where the following predicates are available.
+   */
+  class FnPtrType extends Synth::TFnPtrType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "FnPtrType" }
+
+    /**
+     * Gets the abi of this fn ptr type, if it exists.
+     */
+    Abi getAbi() {
+      result =
+        Synth::convertAbiFromRaw(Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).getAbi())
+    }
+
+    /**
+     * Holds if `getAbi()` exists.
+     */
+    final predicate hasAbi() { exists(this.getAbi()) }
+
+    /**
+     * Gets the parameter list of this fn ptr type, if it exists.
+     */
+    ParamList getParamList() {
+      result =
+        Synth::convertParamListFromRaw(Synth::convertFnPtrTypeToRaw(this)
+              .(Raw::FnPtrType)
+              .getParamList())
+    }
+
+    /**
+     * Holds if `getParamList()` exists.
+     */
+    final predicate hasParamList() { exists(this.getParamList()) }
+
+    /**
+     * Gets the ret type of this fn ptr type, if it exists.
+     */
+    RetType getRetType() {
+      result =
+        Synth::convertRetTypeFromRaw(Synth::convertFnPtrTypeToRaw(this)
+              .(Raw::FnPtrType)
+              .getRetType())
+    }
+
+    /**
+     * Holds if `getRetType()` exists.
+     */
+    final predicate hasRetType() { exists(this.getRetType()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
new file mode 100644
index 0000000000000..b98901936824c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
@@ -0,0 +1,97 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ForExpr`.
+ * 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.BlockExpr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.Label
+import codeql.rust.elements.Pat
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ForExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ForExpr` class directly.
+   * Use the subclass `ForExpr`, where the following predicates are available.
+   */
+  class ForExpr extends Synth::TForExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "ForExpr" }
+
+    /**
+     * Gets the `index`th attr of this for expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this for expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this for expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the iterable of this for expression, if it exists.
+     */
+    Expr getIterable() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getIterable())
+    }
+
+    /**
+     * Holds if `getIterable()` exists.
+     */
+    final predicate hasIterable() { exists(this.getIterable()) }
+
+    /**
+     * Gets the label of this for expression, if it exists.
+     */
+    Label getLabel() {
+      result =
+        Synth::convertLabelFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getLabel())
+    }
+
+    /**
+     * Holds if `getLabel()` exists.
+     */
+    final predicate hasLabel() { exists(this.getLabel()) }
+
+    /**
+     * Gets the loop body of this for expression, if it exists.
+     */
+    BlockExpr getLoopBody() {
+      result =
+        Synth::convertBlockExprFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getLoopBody())
+    }
+
+    /**
+     * Holds if `getLoopBody()` exists.
+     */
+    final predicate hasLoopBody() { exists(this.getLoopBody()) }
+
+    /**
+     * Gets the pat of this for expression, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll
new file mode 100644
index 0000000000000..f633cfb5f9cc0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll
@@ -0,0 +1,52 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ForType`.
+ * 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.GenericParamList
+import codeql.rust.elements.Type
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ForType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ForType` class directly.
+   * Use the subclass `ForType`, where the following predicates are available.
+   */
+  class ForType extends Synth::TForType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "ForType" }
+
+    /**
+     * Gets the generic parameter list of this for type, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertForTypeToRaw(this)
+              .(Raw::ForType)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the ty of this for type, if it exists.
+     */
+    Type getTy() {
+      result = Synth::convertTypeFromRaw(Synth::convertForTypeToRaw(this).(Raw::ForType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll
new file mode 100644
index 0000000000000..d3d94ef2a4337
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll
@@ -0,0 +1,55 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FormatArgsArg`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Name
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FormatArgsArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::FormatArgsArg` class directly.
+   * Use the subclass `FormatArgsArg`, where the following predicates are available.
+   */
+  class FormatArgsArg extends Synth::TFormatArgsArg, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "FormatArgsArg" }
+
+    /**
+     * Gets the expression of this format arguments argument, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertFormatArgsArgToRaw(this)
+              .(Raw::FormatArgsArg)
+              .getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the name of this format arguments argument, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertFormatArgsArgToRaw(this)
+              .(Raw::FormatArgsArg)
+              .getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll
new file mode 100644
index 0000000000000..52c684eba56dd
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll
@@ -0,0 +1,81 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FormatArgsExpr`.
+ * 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.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.FormatArgsArg
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FormatArgsExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::FormatArgsExpr` class directly.
+   * Use the subclass `FormatArgsExpr`, where the following predicates are available.
+   */
+  class FormatArgsExpr extends Synth::TFormatArgsExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "FormatArgsExpr" }
+
+    /**
+     * Gets the `index`th argument of this format arguments expression (0-based).
+     */
+    FormatArgsArg getArg(int index) {
+      result =
+        Synth::convertFormatArgsArgFromRaw(Synth::convertFormatArgsExprToRaw(this)
+              .(Raw::FormatArgsExpr)
+              .getArg(index))
+    }
+
+    /**
+     * Gets any of the arguments of this format arguments expression.
+     */
+    final FormatArgsArg getAnArg() { result = this.getArg(_) }
+
+    /**
+     * Gets the number of arguments of this format arguments expression.
+     */
+    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
+
+    /**
+     * Gets the `index`th attr of this format arguments expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertFormatArgsExprToRaw(this)
+              .(Raw::FormatArgsExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this format arguments expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this format arguments expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the template of this format arguments expression, if it exists.
+     */
+    Expr getTemplate() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertFormatArgsExprToRaw(this)
+              .(Raw::FormatArgsExpr)
+              .getTemplate())
+    }
+
+    /**
+     * Holds if `getTemplate()` exists.
+     */
+    final predicate hasTemplate() { exists(this.getTemplate()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
deleted file mode 100644
index 7e9c7d4032ff2..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
+++ /dev/null
@@ -1,47 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `Function`.
- * 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.DeclarationImpl::Impl as DeclarationImpl
-import codeql.rust.elements.Expr
-
-/**
- * INTERNAL: This module contains the fully generated definition of `Function` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A function declaration. For example
-   * ```
-   * fn foo(x: u32) -> u64 {(x + 1).into()}
-   * ```
-   * A function declaration within a trait might not have a body:
-   * ```
-   * trait Trait {
-   *     fn bar();
-   * }
-   * ```
-   * INTERNAL: Do not reference the `Generated::Function` class directly.
-   * Use the subclass `Function`, where the following predicates are available.
-   */
-  class Function extends Synth::TFunction, DeclarationImpl::Declaration {
-    override string getAPrimaryQlClass() { result = "Function" }
-
-    /**
-     * Gets the name of this function.
-     */
-    string getName() { result = Synth::convertFunctionToRaw(this).(Raw::Function).getName() }
-
-    /**
-     * Gets the body of this function.
-     */
-    Expr getBody() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertFunctionToRaw(this).(Raw::Function).getBody())
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArg.qll
new file mode 100644
index 0000000000000..7de1e7107dc0a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArg.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `GenericArg`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `GenericArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::GenericArg` class directly.
+   * Use the subclass `GenericArg`, where the following predicates are available.
+   */
+  class GenericArg extends Synth::TGenericArg, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArgList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArgList.qll
index b443b9521015e..450b31d8ff25e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArgList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericArgList.qll
@@ -7,7 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.internal.UnimplementedImpl::Impl as UnimplementedImpl
+import codeql.rust.elements.GenericArg
 
 /**
  * INTERNAL: This module contains the fully generated definition of `GenericArgList` and should not
@@ -15,16 +15,30 @@ import codeql.rust.elements.internal.UnimplementedImpl::Impl as UnimplementedImp
  */
 module Generated {
   /**
-   * The base class for generic arguments.
-   * ```
-   * x.foo::<u32, u64>(42);
-   * ```
    * INTERNAL: Do not reference the `Generated::GenericArgList` class directly.
    * Use the subclass `GenericArgList`, where the following predicates are available.
    */
-  class GenericArgList extends Synth::TGenericArgList, AstNodeImpl::AstNode,
-    UnimplementedImpl::Unimplemented
-  {
+  class GenericArgList extends Synth::TGenericArgList, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "GenericArgList" }
+
+    /**
+     * Gets the `index`th generic argument of this generic argument list (0-based).
+     */
+    GenericArg getGenericArg(int index) {
+      result =
+        Synth::convertGenericArgFromRaw(Synth::convertGenericArgListToRaw(this)
+              .(Raw::GenericArgList)
+              .getGenericArg(index))
+    }
+
+    /**
+     * Gets any of the generic arguments of this generic argument list.
+     */
+    final GenericArg getAGenericArg() { result = this.getGenericArg(_) }
+
+    /**
+     * Gets the number of generic arguments of this generic argument list.
+     */
+    final int getNumberOfGenericArgs() { result = count(int i | exists(this.getGenericArg(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParam.qll
new file mode 100644
index 0000000000000..50fec6d0dcb78
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParam.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `GenericParam`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `GenericParam` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::GenericParam` class directly.
+   * Use the subclass `GenericParam`, where the following predicates are available.
+   */
+  class GenericParam extends Synth::TGenericParam, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParamList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParamList.qll
new file mode 100644
index 0000000000000..220727c991cd2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/GenericParamList.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `GenericParamList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.GenericParam
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `GenericParamList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::GenericParamList` class directly.
+   * Use the subclass `GenericParamList`, where the following predicates are available.
+   */
+  class GenericParamList extends Synth::TGenericParamList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "GenericParamList" }
+
+    /**
+     * Gets the `index`th generic parameter of this generic parameter list (0-based).
+     */
+    GenericParam getGenericParam(int index) {
+      result =
+        Synth::convertGenericParamFromRaw(Synth::convertGenericParamListToRaw(this)
+              .(Raw::GenericParamList)
+              .getGenericParam(index))
+    }
+
+    /**
+     * Gets any of the generic parameters of this generic parameter list.
+     */
+    final GenericParam getAGenericParam() { result = this.getGenericParam(_) }
+
+    /**
+     * Gets the number of generic parameters of this generic parameter list.
+     */
+    final int getNumberOfGenericParams() { result = count(int i | exists(this.getGenericParam(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
index 41684ee4826c0..78fbbee139fb1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
@@ -6,6 +6,8 @@
 
 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.Name
 import codeql.rust.elements.Pat
 import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
 
@@ -15,19 +17,6 @@ import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
  */
 module Generated {
   /**
-   * A binding pattern. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) => y,
-   *     Option::None => 0,
-   * };
-   * ```
-   * ```
-   * match x {
-   *     y@Option::Some(_) => y,
-   *     Option::None => 0,
-   * };
-   * ```
    * INTERNAL: Do not reference the `Generated::IdentPat` class directly.
    * Use the subclass `IdentPat`, where the following predicates are available.
    */
@@ -35,23 +24,46 @@ module Generated {
     override string getAPrimaryQlClass() { result = "IdentPat" }
 
     /**
-     * Gets the binding of this ident pat.
+     * Gets the `index`th attr of this ident pat (0-based).
      */
-    string getBindingId() {
-      result = Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getBindingId()
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getAttr(index))
     }
 
     /**
-     * Gets the subpat of this ident pat, if it exists.
+     * Gets any of the attrs of this ident pat.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this ident pat.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the name of this ident pat, if it exists.
      */
-    Pat getSubpat() {
+    Name getName() {
       result =
-        Synth::convertPatFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getSubpat())
+        Synth::convertNameFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the pat of this ident pat, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getPat())
     }
 
     /**
-     * Holds if `getSubpat()` exists.
+     * Holds if `getPat()` exists.
      */
-    final predicate hasSubpat() { exists(this.getSubpat()) }
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll
index a6a5656249d7c..dba72aaaa6afb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IfExpr.qll
@@ -6,6 +6,8 @@
 
 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.BlockExpr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,19 +17,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * An `if` expression. For example:
-   * ```
-   * if x == 42 {
-   *     println!("that's the answer");
-   * }
-   * ```
-   * ```
-   * let y = if x > 0 {
-   *     1
-   * } else {
-   *     0
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::IfExpr` class directly.
    * Use the subclass `IfExpr`, where the following predicates are available.
    */
@@ -35,7 +24,25 @@ module Generated {
     override string getAPrimaryQlClass() { result = "IfExpr" }
 
     /**
-     * Gets the condition of this if expression.
+     * Gets the `index`th attr of this if expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertIfExprToRaw(this).(Raw::IfExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this if expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this if expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the condition of this if expression, if it exists.
      */
     Expr getCondition() {
       result =
@@ -43,22 +50,34 @@ module Generated {
     }
 
     /**
-     * Gets the then of this if expression.
+     * Holds if `getCondition()` exists.
      */
-    Expr getThen() {
-      result = Synth::convertExprFromRaw(Synth::convertIfExprToRaw(this).(Raw::IfExpr).getThen())
+    final predicate hasCondition() { exists(this.getCondition()) }
+
+    /**
+     * Gets the else branch of this if expression, if it exists.
+     */
+    Expr getElseBranch() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertIfExprToRaw(this).(Raw::IfExpr).getElseBranch())
     }
 
     /**
-     * Gets the else of this if expression, if it exists.
+     * Holds if `getElseBranch()` exists.
      */
-    Expr getElse() {
-      result = Synth::convertExprFromRaw(Synth::convertIfExprToRaw(this).(Raw::IfExpr).getElse())
+    final predicate hasElseBranch() { exists(this.getElseBranch()) }
+
+    /**
+     * Gets the then branch of this if expression, if it exists.
+     */
+    BlockExpr getThenBranch() {
+      result =
+        Synth::convertBlockExprFromRaw(Synth::convertIfExprToRaw(this).(Raw::IfExpr).getThenBranch())
     }
 
     /**
-     * Holds if `getElse()` exists.
+     * Holds if `getThenBranch()` exists.
      */
-    final predicate hasElse() { exists(this.getElse()) }
+    final predicate hasThenBranch() { exists(this.getThenBranch()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
new file mode 100644
index 0000000000000..03a32132809a4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
@@ -0,0 +1,126 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Impl`.
+ * 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.AssocItemList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Type
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Impl` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Impl` class directly.
+   * Use the subclass `Impl`, where the following predicates are available.
+   */
+  class Impl extends Synth::TImpl, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Impl" }
+
+    /**
+     * Gets the assoc item list of this impl, if it exists.
+     */
+    AssocItemList getAssocItemList() {
+      result =
+        Synth::convertAssocItemListFromRaw(Synth::convertImplToRaw(this)
+              .(Raw::Impl)
+              .getAssocItemList())
+    }
+
+    /**
+     * Holds if `getAssocItemList()` exists.
+     */
+    final predicate hasAssocItemList() { exists(this.getAssocItemList()) }
+
+    /**
+     * Gets the `index`th attr of this impl (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this impl.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this impl.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the generic parameter list of this impl, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertImplToRaw(this)
+              .(Raw::Impl)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the self ty of this impl, if it exists.
+     */
+    Type getSelfTy() {
+      result = Synth::convertTypeFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getSelfTy())
+    }
+
+    /**
+     * Holds if `getSelfTy()` exists.
+     */
+    final predicate hasSelfTy() { exists(this.getSelfTy()) }
+
+    /**
+     * Gets the trait of this impl, if it exists.
+     */
+    Type getTrait() {
+      result = Synth::convertTypeFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getTrait())
+    }
+
+    /**
+     * Holds if `getTrait()` exists.
+     */
+    final predicate hasTrait() { exists(this.getTrait()) }
+
+    /**
+     * Gets the visibility of this impl, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this impl, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll
new file mode 100644
index 0000000000000..fcbba14d45d1a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll
@@ -0,0 +1,39 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ImplTraitType`.
+ * 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.TypeBoundList
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ImplTraitType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ImplTraitType` class directly.
+   * Use the subclass `ImplTraitType`, where the following predicates are available.
+   */
+  class ImplTraitType extends Synth::TImplTraitType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "ImplTraitType" }
+
+    /**
+     * Gets the type bound list of this impl trait type, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertImplTraitTypeToRaw(this)
+              .(Raw::ImplTraitType)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll
index a07b1261ef444..8d0a7f0bddabe 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IndexExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,11 +16,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * An index expression. For example:
-   * ```
-   * list[42];
-   * list[42] = 1;
-   * ```
    * INTERNAL: Do not reference the `Generated::IndexExpr` class directly.
    * Use the subclass `IndexExpr`, where the following predicates are available.
    */
@@ -27,7 +23,25 @@ module Generated {
     override string getAPrimaryQlClass() { result = "IndexExpr" }
 
     /**
-     * Gets the base of this index expression.
+     * Gets the `index`th attr of this index expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertIndexExprToRaw(this).(Raw::IndexExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this index expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this index expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the base of this index expression, if it exists.
      */
     Expr getBase() {
       result =
@@ -35,7 +49,12 @@ module Generated {
     }
 
     /**
-     * Gets the index of this index expression.
+     * Holds if `getBase()` exists.
+     */
+    final predicate hasBase() { exists(this.getBase()) }
+
+    /**
+     * Gets the index of this index expression, if it exists.
      */
     Expr getIndex() {
       result =
@@ -43,10 +62,8 @@ module Generated {
     }
 
     /**
-     * Holds if this index expression is assignee expression.
+     * Holds if `getIndex()` exists.
      */
-    predicate isAssigneeExpr() {
-      Synth::convertIndexExprToRaw(this).(Raw::IndexExpr).isAssigneeExpr()
-    }
+    final predicate hasIndex() { exists(this.getIndex()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll
new file mode 100644
index 0000000000000..8d14b46808cd7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `InferType`.
+ * 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.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `InferType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::InferType` class directly.
+   * Use the subclass `InferType`, where the following predicates are available.
+   */
+  class InferType extends Synth::TInferType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "InferType" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll
new file mode 100644
index 0000000000000..184a913560c76
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Item`.
+ * 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.StmtImpl::Impl as StmtImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Item` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Item` class directly.
+   * Use the subclass `Item`, where the following predicates are available.
+   */
+  class Item extends Synth::TItem, StmtImpl::Stmt { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ItemList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ItemList.qll
new file mode 100644
index 0000000000000..34dfd43217c61
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ItemList.qll
@@ -0,0 +1,61 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ItemList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ItemList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ItemList` class directly.
+   * Use the subclass `ItemList`, where the following predicates are available.
+   */
+  class ItemList extends Synth::TItemList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ItemList" }
+
+    /**
+     * Gets the `index`th attr of this item list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertItemListToRaw(this).(Raw::ItemList).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this item list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this item list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th item of this item list (0-based).
+     */
+    Item getItem(int index) {
+      result =
+        Synth::convertItemFromRaw(Synth::convertItemListToRaw(this).(Raw::ItemList).getItem(index))
+    }
+
+    /**
+     * Gets any of the items of this item list.
+     */
+    final Item getAnItem() { result = this.getItem(_) }
+
+    /**
+     * Gets the number of items of this item list.
+     */
+    final int getNumberOfItems() { result = count(int i | exists(this.getItem(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ItemStmt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ItemStmt.qll
deleted file mode 100644
index b032909ef7fa2..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ItemStmt.qll
+++ /dev/null
@@ -1,30 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ItemStmt`.
- * 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.StmtImpl::Impl as StmtImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ItemStmt` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * An item statement. For example:
-   * ```
-   * fn print_hello() {
-   *     println!("Hello, world!");
-   * }
-   * print_hello();
-   * ```
-   * INTERNAL: Do not reference the `Generated::ItemStmt` class directly.
-   * Use the subclass `ItemStmt`, where the following predicates are available.
-   */
-  class ItemStmt extends Synth::TItemStmt, StmtImpl::Stmt {
-    override string getAPrimaryQlClass() { result = "ItemStmt" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Label.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Label.qll
index b6a688196d15b..3605a1bac531d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Label.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Label.qll
@@ -7,6 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Lifetime
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Label` and should not
@@ -14,13 +15,6 @@ import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
  */
 module Generated {
   /**
-   * A label. For example:
-   * ```
-   * 'label: loop {
-   *     println!("Hello, world (once)!");
-   *     break 'label;
-   * };
-   * ```
    * INTERNAL: Do not reference the `Generated::Label` class directly.
    * Use the subclass `Label`, where the following predicates are available.
    */
@@ -28,8 +22,16 @@ module Generated {
     override string getAPrimaryQlClass() { result = "Label" }
 
     /**
-     * Gets the name of this label.
+     * Gets the lifetime of this label, if it exists.
      */
-    string getName() { result = Synth::convertLabelToRaw(this).(Raw::Label).getName() }
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertLabelToRaw(this).(Raw::Label).getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetElse.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetElse.qll
new file mode 100644
index 0000000000000..c4157e5fc1feb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetElse.qll
@@ -0,0 +1,39 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `LetElse`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.BlockExpr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `LetElse` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::LetElse` class directly.
+   * Use the subclass `LetElse`, where the following predicates are available.
+   */
+  class LetElse extends Synth::TLetElse, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "LetElse" }
+
+    /**
+     * Gets the block expression of this let else, if it exists.
+     */
+    BlockExpr getBlockExpr() {
+      result =
+        Synth::convertBlockExprFromRaw(Synth::convertLetElseToRaw(this)
+              .(Raw::LetElse)
+              .getBlockExpr())
+    }
+
+    /**
+     * Holds if `getBlockExpr()` exists.
+     */
+    final predicate hasBlockExpr() { exists(this.getBlockExpr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
index ab73f26a080f3..2d8a06ec9e06f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Pat
@@ -16,12 +17,6 @@ import codeql.rust.elements.Pat
  */
 module Generated {
   /**
-   * A `let` expression. For example:
-   * ```
-   * if let Some(x) = maybe_some {
-   *     println!("{}", x);
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::LetExpr` class directly.
    * Use the subclass `LetExpr`, where the following predicates are available.
    */
@@ -29,17 +24,45 @@ module Generated {
     override string getAPrimaryQlClass() { result = "LetExpr" }
 
     /**
-     * Gets the pat of this let expression.
+     * Gets the `index`th attr of this let expression (0-based).
      */
-    Pat getPat() {
-      result = Synth::convertPatFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getPat())
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getAttr(index))
     }
 
     /**
-     * Gets the expression of this let expression.
+     * Gets any of the attrs of this let expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this let expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this let expression, if it exists.
      */
     Expr getExpr() {
       result = Synth::convertExprFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getExpr())
     }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the pat of this let expression, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
index a2b85d3879cbf..283b6a758a5b2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
@@ -6,10 +6,12 @@
 
 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.Expr
+import codeql.rust.elements.LetElse
 import codeql.rust.elements.Pat
 import codeql.rust.elements.internal.StmtImpl::Impl as StmtImpl
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Type
 
 /**
  * INTERNAL: This module contains the fully generated definition of `LetStmt` and should not
@@ -17,16 +19,6 @@ import codeql.rust.elements.TypeRef
  */
 module Generated {
   /**
-   * A let statement. For example:
-   * ```
-   * let x = 42;
-   * let x: i32 = 42;
-   * let x: i32;
-   * let x;
-   * let (x, y) = (1, 2);
-   * let Some(x) = std::env::var("FOO") else {
-   *     return;
-   * };
    * INTERNAL: Do not reference the `Generated::LetStmt` class directly.
    * Use the subclass `LetStmt`, where the following predicates are available.
    */
@@ -34,24 +26,22 @@ module Generated {
     override string getAPrimaryQlClass() { result = "LetStmt" }
 
     /**
-     * Gets the pat of this let statement.
+     * Gets the `index`th attr of this let statement (0-based).
      */
-    Pat getPat() {
-      result = Synth::convertPatFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getPat())
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getAttr(index))
     }
 
     /**
-     * Gets the type of this let statement, if it exists.
+     * Gets any of the attrs of this let statement.
      */
-    TypeRef getType() {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getType())
-    }
+    final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Holds if `getType()` exists.
+     * Gets the number of attrs of this let statement.
      */
-    final predicate hasType() { exists(this.getType()) }
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
      * Gets the initializer of this let statement, if it exists.
@@ -67,15 +57,40 @@ module Generated {
     final predicate hasInitializer() { exists(this.getInitializer()) }
 
     /**
-     * Gets the else of this let statement, if it exists.
+     * Gets the let else of this let statement, if it exists.
+     */
+    LetElse getLetElse() {
+      result =
+        Synth::convertLetElseFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getLetElse())
+    }
+
+    /**
+     * Holds if `getLetElse()` exists.
+     */
+    final predicate hasLetElse() { exists(this.getLetElse()) }
+
+    /**
+     * Gets the pat of this let statement, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
+
+    /**
+     * Gets the ty of this let statement, if it exists.
      */
-    Expr getElse() {
-      result = Synth::convertExprFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getElse())
+    Type getTy() {
+      result = Synth::convertTypeFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getTy())
     }
 
     /**
-     * Holds if `getElse()` exists.
+     * Holds if `getTy()` exists.
      */
-    final predicate hasElse() { exists(this.getElse()) }
+    final predicate hasTy() { exists(this.getTy()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Lifetime.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Lifetime.qll
new file mode 100644
index 0000000000000..5743c402cc2ad
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Lifetime.qll
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Lifetime`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Lifetime` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Lifetime` class directly.
+   * Use the subclass `Lifetime`, where the following predicates are available.
+   */
+  class Lifetime extends Synth::TLifetime, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Lifetime" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll
new file mode 100644
index 0000000000000..d43c5eb87346c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeArg.qll
@@ -0,0 +1,39 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `LifetimeArg`.
+ * 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.GenericArgImpl::Impl as GenericArgImpl
+import codeql.rust.elements.Lifetime
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `LifetimeArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::LifetimeArg` class directly.
+   * Use the subclass `LifetimeArg`, where the following predicates are available.
+   */
+  class LifetimeArg extends Synth::TLifetimeArg, GenericArgImpl::GenericArg {
+    override string getAPrimaryQlClass() { result = "LifetimeArg" }
+
+    /**
+     * Gets the lifetime of this lifetime argument, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertLifetimeArgToRaw(this)
+              .(Raw::LifetimeArg)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll
new file mode 100644
index 0000000000000..db88db9d8005b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LifetimeParam.qll
@@ -0,0 +1,76 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `LifetimeParam`.
+ * 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.internal.GenericParamImpl::Impl as GenericParamImpl
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeBoundList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `LifetimeParam` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::LifetimeParam` class directly.
+   * Use the subclass `LifetimeParam`, where the following predicates are available.
+   */
+  class LifetimeParam extends Synth::TLifetimeParam, GenericParamImpl::GenericParam {
+    override string getAPrimaryQlClass() { result = "LifetimeParam" }
+
+    /**
+     * Gets the `index`th attr of this lifetime parameter (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertLifetimeParamToRaw(this)
+              .(Raw::LifetimeParam)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this lifetime parameter.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this lifetime parameter.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the lifetime of this lifetime parameter, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertLifetimeParamToRaw(this)
+              .(Raw::LifetimeParam)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the type bound list of this lifetime parameter, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertLifetimeParamToRaw(this)
+              .(Raw::LifetimeParam)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Literal.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Literal.qll
new file mode 100644
index 0000000000000..4c0fa3edd0cf0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Literal.qll
@@ -0,0 +1,42 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Literal`.
+ * 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.internal.ExprImpl::Impl as ExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Literal` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Literal` class directly.
+   * Use the subclass `Literal`, where the following predicates are available.
+   */
+  class Literal extends Synth::TLiteral, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "Literal" }
+
+    /**
+     * Gets the `index`th attr of this literal (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertLiteralToRaw(this).(Raw::Literal).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this literal.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this literal.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll
deleted file mode 100644
index ace334c5c59b7..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralExpr.qll
+++ /dev/null
@@ -1,33 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `LiteralExpr`.
- * 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.ExprImpl::Impl as ExprImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `LiteralExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A literal expression. For example:
-   * ```
-   * 42;
-   * 42.0;
-   * "Hello, world!";
-   * b"Hello, world!";
-   * 'x';
-   * b'x';
-   * r"Hello, world!";
-   * true;
-   * INTERNAL: Do not reference the `Generated::LiteralExpr` class directly.
-   * Use the subclass `LiteralExpr`, where the following predicates are available.
-   */
-  class LiteralExpr extends Synth::TLiteralExpr, ExprImpl::Expr {
-    override string getAPrimaryQlClass() { result = "LiteralExpr" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
index 10d31400b8015..9b2570f97ca6e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
+import codeql.rust.elements.Literal
 import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
 
 /**
@@ -15,13 +15,6 @@ import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
  */
 module Generated {
   /**
-   * A literal pattern. For example:
-   * ```
-   * match x {
-   *     42 => "ok",
-   *     _ => "fail",
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::LiteralPat` class directly.
    * Use the subclass `LiteralPat`, where the following predicates are available.
    */
@@ -29,11 +22,18 @@ module Generated {
     override string getAPrimaryQlClass() { result = "LiteralPat" }
 
     /**
-     * Gets the expression of this literal pat.
+     * Gets the literal of this literal pat, if it exists.
      */
-    Expr getExpr() {
+    Literal getLiteral() {
       result =
-        Synth::convertExprFromRaw(Synth::convertLiteralPatToRaw(this).(Raw::LiteralPat).getExpr())
+        Synth::convertLiteralFromRaw(Synth::convertLiteralPatToRaw(this)
+              .(Raw::LiteralPat)
+              .getLiteral())
     }
+
+    /**
+     * Holds if `getLiteral()` exists.
+     */
+    final predicate hasLiteral() { exists(this.getLiteral()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
index 39bd77da989ae..ed74a92e1306a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
@@ -6,7 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
+import codeql.rust.elements.Attr
+import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Label
 
@@ -16,28 +17,6 @@ import codeql.rust.elements.Label
  */
 module Generated {
   /**
-   * A loop expression. For example:
-   * ```
-   * loop {
-   *     println!("Hello, world (again)!");
-   * };
-   * ```
-   * ```
-   * 'label: loop {
-   *     println!("Hello, world (once)!");
-   *     break 'label;
-   * };
-   * ```
-   * ```
-   * let mut x = 0;
-   * loop {
-   *     if x < 10 {
-   *         x += 1;
-   *     } else {
-   *         break;
-   *     }
-   * };
-   * ```
    * INTERNAL: Do not reference the `Generated::LoopExpr` class directly.
    * Use the subclass `LoopExpr`, where the following predicates are available.
    */
@@ -45,13 +24,23 @@ module Generated {
     override string getAPrimaryQlClass() { result = "LoopExpr" }
 
     /**
-     * Gets the body of this loop expression.
+     * Gets the `index`th attr of this loop expression (0-based).
      */
-    Expr getBody() {
+    Attr getAttr(int index) {
       result =
-        Synth::convertExprFromRaw(Synth::convertLoopExprToRaw(this).(Raw::LoopExpr).getBody())
+        Synth::convertAttrFromRaw(Synth::convertLoopExprToRaw(this).(Raw::LoopExpr).getAttr(index))
     }
 
+    /**
+     * Gets any of the attrs of this loop expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this loop expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the label of this loop expression, if it exists.
      */
@@ -64,5 +53,20 @@ module Generated {
      * Holds if `getLabel()` exists.
      */
     final predicate hasLabel() { exists(this.getLabel()) }
+
+    /**
+     * Gets the loop body of this loop expression, if it exists.
+     */
+    BlockExpr getLoopBody() {
+      result =
+        Synth::convertBlockExprFromRaw(Synth::convertLoopExprToRaw(this)
+              .(Raw::LoopExpr)
+              .getLoopBody())
+    }
+
+    /**
+     * Holds if `getLoopBody()` exists.
+     */
+    final predicate hasLoopBody() { exists(this.getLoopBody()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
new file mode 100644
index 0000000000000..6ae26b337694c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroCall.qll
@@ -0,0 +1,76 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroCall`.
+ * 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.AssocItemImpl::Impl as AssocItemImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Path
+import codeql.rust.elements.TokenTree
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroCall` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MacroCall` class directly.
+   * Use the subclass `MacroCall`, where the following predicates are available.
+   */
+  class MacroCall extends Synth::TMacroCall, AssocItemImpl::AssocItem, ExternItemImpl::ExternItem,
+    ItemImpl::Item
+  {
+    override string getAPrimaryQlClass() { result = "MacroCall" }
+
+    /**
+     * Gets the `index`th attr of this macro call (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertMacroCallToRaw(this).(Raw::MacroCall).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this macro call.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this macro call.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the path of this macro call, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertMacroCallToRaw(this).(Raw::MacroCall).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+
+    /**
+     * Gets the token tree of this macro call, if it exists.
+     */
+    TokenTree getTokenTree() {
+      result =
+        Synth::convertTokenTreeFromRaw(Synth::convertMacroCallToRaw(this)
+              .(Raw::MacroCall)
+              .getTokenTree())
+    }
+
+    /**
+     * Holds if `getTokenTree()` exists.
+     */
+    final predicate hasTokenTree() { exists(this.getTokenTree()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroDef.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroDef.qll
new file mode 100644
index 0000000000000..b0b4f288cf53d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroDef.qll
@@ -0,0 +1,99 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroDef`.
+ * 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.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TokenTree
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroDef` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MacroDef` class directly.
+   * Use the subclass `MacroDef`, where the following predicates are available.
+   */
+  class MacroDef extends Synth::TMacroDef, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "MacroDef" }
+
+    /**
+     * Gets the arguments of this macro def, if it exists.
+     */
+    TokenTree getArgs() {
+      result =
+        Synth::convertTokenTreeFromRaw(Synth::convertMacroDefToRaw(this).(Raw::MacroDef).getArgs())
+    }
+
+    /**
+     * Holds if `getArgs()` exists.
+     */
+    final predicate hasArgs() { exists(this.getArgs()) }
+
+    /**
+     * Gets the `index`th attr of this macro def (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertMacroDefToRaw(this).(Raw::MacroDef).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this macro def.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this macro def.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the body of this macro def, if it exists.
+     */
+    TokenTree getBody() {
+      result =
+        Synth::convertTokenTreeFromRaw(Synth::convertMacroDefToRaw(this).(Raw::MacroDef).getBody())
+    }
+
+    /**
+     * Holds if `getBody()` exists.
+     */
+    final predicate hasBody() { exists(this.getBody()) }
+
+    /**
+     * Gets the name of this macro def, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertMacroDefToRaw(this).(Raw::MacroDef).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the visibility of this macro def, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertMacroDefToRaw(this)
+              .(Raw::MacroDef)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroExpr.qll
new file mode 100644
index 0000000000000..9ac002406da28
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroExpr.qll
@@ -0,0 +1,39 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroExpr`.
+ * 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.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.MacroCall
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MacroExpr` class directly.
+   * Use the subclass `MacroExpr`, where the following predicates are available.
+   */
+  class MacroExpr extends Synth::TMacroExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "MacroExpr" }
+
+    /**
+     * Gets the macro call of this macro expression, if it exists.
+     */
+    MacroCall getMacroCall() {
+      result =
+        Synth::convertMacroCallFromRaw(Synth::convertMacroExprToRaw(this)
+              .(Raw::MacroExpr)
+              .getMacroCall())
+    }
+
+    /**
+     * Holds if `getMacroCall()` exists.
+     */
+    final predicate hasMacroCall() { exists(this.getMacroCall()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
new file mode 100644
index 0000000000000..b9c802be8433c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroItems.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroItems`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Item
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroItems` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MacroItems` class directly.
+   * Use the subclass `MacroItems`, where the following predicates are available.
+   */
+  class MacroItems extends Synth::TMacroItems, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "MacroItems" }
+
+    /**
+     * Gets the `index`th item of this macro items (0-based).
+     */
+    Item getItem(int index) {
+      result =
+        Synth::convertItemFromRaw(Synth::convertMacroItemsToRaw(this)
+              .(Raw::MacroItems)
+              .getItem(index))
+    }
+
+    /**
+     * Gets any of the items of this macro items.
+     */
+    final Item getAnItem() { result = this.getItem(_) }
+
+    /**
+     * Gets the number of items of this macro items.
+     */
+    final int getNumberOfItems() { result = count(int i | exists(this.getItem(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
new file mode 100644
index 0000000000000..2eabab34fbd18
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
@@ -0,0 +1,39 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroPat`.
+ * 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.MacroCall
+import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroPat` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MacroPat` class directly.
+   * Use the subclass `MacroPat`, where the following predicates are available.
+   */
+  class MacroPat extends Synth::TMacroPat, PatImpl::Pat {
+    override string getAPrimaryQlClass() { result = "MacroPat" }
+
+    /**
+     * Gets the macro call of this macro pat, if it exists.
+     */
+    MacroCall getMacroCall() {
+      result =
+        Synth::convertMacroCallFromRaw(Synth::convertMacroPatToRaw(this)
+              .(Raw::MacroPat)
+              .getMacroCall())
+    }
+
+    /**
+     * Holds if `getMacroCall()` exists.
+     */
+    final predicate hasMacroCall() { exists(this.getMacroCall()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroRules.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroRules.qll
new file mode 100644
index 0000000000000..eabbcde752189
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroRules.qll
@@ -0,0 +1,90 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroRules`.
+ * 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.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TokenTree
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroRules` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MacroRules` class directly.
+   * Use the subclass `MacroRules`, where the following predicates are available.
+   */
+  class MacroRules extends Synth::TMacroRules, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "MacroRules" }
+
+    /**
+     * Gets the `index`th attr of this macro rules (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertMacroRulesToRaw(this)
+              .(Raw::MacroRules)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this macro rules.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this macro rules.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the name of this macro rules, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertMacroRulesToRaw(this).(Raw::MacroRules).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the token tree of this macro rules, if it exists.
+     */
+    TokenTree getTokenTree() {
+      result =
+        Synth::convertTokenTreeFromRaw(Synth::convertMacroRulesToRaw(this)
+              .(Raw::MacroRules)
+              .getTokenTree())
+    }
+
+    /**
+     * Holds if `getTokenTree()` exists.
+     */
+    final predicate hasTokenTree() { exists(this.getTokenTree()) }
+
+    /**
+     * Gets the visibility of this macro rules, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertMacroRulesToRaw(this)
+              .(Raw::MacroRules)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll
new file mode 100644
index 0000000000000..331277241fa5f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroStmts.qll
@@ -0,0 +1,58 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroStmts`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Stmt
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroStmts` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MacroStmts` class directly.
+   * Use the subclass `MacroStmts`, where the following predicates are available.
+   */
+  class MacroStmts extends Synth::TMacroStmts, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "MacroStmts" }
+
+    /**
+     * Gets the expression of this macro statements, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertMacroStmtsToRaw(this).(Raw::MacroStmts).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the `index`th statement of this macro statements (0-based).
+     */
+    Stmt getStatement(int index) {
+      result =
+        Synth::convertStmtFromRaw(Synth::convertMacroStmtsToRaw(this)
+              .(Raw::MacroStmts)
+              .getStatement(index))
+    }
+
+    /**
+     * Gets any of the statements of this macro statements.
+     */
+    final Stmt getAStatement() { result = this.getStatement(_) }
+
+    /**
+     * Gets the number of statements of this macro statements.
+     */
+    final int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll
new file mode 100644
index 0000000000000..c8b9b43c6333d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll
@@ -0,0 +1,39 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroType`.
+ * 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.MacroCall
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MacroType` class directly.
+   * Use the subclass `MacroType`, where the following predicates are available.
+   */
+  class MacroType extends Synth::TMacroType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "MacroType" }
+
+    /**
+     * Gets the macro call of this macro type, if it exists.
+     */
+    MacroCall getMacroCall() {
+      result =
+        Synth::convertMacroCallFromRaw(Synth::convertMacroTypeToRaw(this)
+              .(Raw::MacroType)
+              .getMacroCall())
+    }
+
+    /**
+     * Holds if `getMacroCall()` exists.
+     */
+    final predicate hasMacroCall() { exists(this.getMacroCall()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
index 985963bb2d315..d45c62fc18d90 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
@@ -7,7 +7,9 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.MatchGuard
 import codeql.rust.elements.Pat
 
 /**
@@ -16,19 +18,6 @@ import codeql.rust.elements.Pat
  */
 module Generated {
   /**
-   * A match arm. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) => y,
-   *     Option::None => 0,
-   * };
-   * ```
-   * ```
-   * match x {
-   *     Some(y) if y != 0 => 1 / y,
-   *     _ => 0,
-   * };
-   * ```
    * INTERNAL: Do not reference the `Generated::MatchArm` class directly.
    * Use the subclass `MatchArm`, where the following predicates are available.
    */
@@ -36,18 +25,42 @@ module Generated {
     override string getAPrimaryQlClass() { result = "MatchArm" }
 
     /**
-     * Gets the pat of this match arm.
+     * Gets the `index`th attr of this match arm (0-based).
      */
-    Pat getPat() {
-      result = Synth::convertPatFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getPat())
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getAttr(index))
     }
 
+    /**
+     * Gets any of the attrs of this match arm.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this match arm.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this match arm, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
     /**
      * Gets the guard of this match arm, if it exists.
      */
-    Expr getGuard() {
+    MatchGuard getGuard() {
       result =
-        Synth::convertExprFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getGuard())
+        Synth::convertMatchGuardFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getGuard())
     }
 
     /**
@@ -56,11 +69,15 @@ module Generated {
     final predicate hasGuard() { exists(this.getGuard()) }
 
     /**
-     * Gets the expression of this match arm.
+     * Gets the pat of this match arm, if it exists.
      */
-    Expr getExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getExpr())
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getPat())
     }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArmList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArmList.qll
new file mode 100644
index 0000000000000..c1246762d8802
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArmList.qll
@@ -0,0 +1,65 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MatchArmList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.MatchArm
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MatchArmList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MatchArmList` class directly.
+   * Use the subclass `MatchArmList`, where the following predicates are available.
+   */
+  class MatchArmList extends Synth::TMatchArmList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "MatchArmList" }
+
+    /**
+     * Gets the `index`th arm of this match arm list (0-based).
+     */
+    MatchArm getArm(int index) {
+      result =
+        Synth::convertMatchArmFromRaw(Synth::convertMatchArmListToRaw(this)
+              .(Raw::MatchArmList)
+              .getArm(index))
+    }
+
+    /**
+     * Gets any of the arms of this match arm list.
+     */
+    final MatchArm getAnArm() { result = this.getArm(_) }
+
+    /**
+     * Gets the number of arms of this match arm list.
+     */
+    final int getNumberOfArms() { result = count(int i | exists(this.getArm(i))) }
+
+    /**
+     * Gets the `index`th attr of this match arm list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertMatchArmListToRaw(this)
+              .(Raw::MatchArmList)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this match arm list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this match arm list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
index 354df6af75849..8767f3f655d24 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
@@ -6,9 +6,10 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.MatchArm
+import codeql.rust.elements.MatchArmList
 
 /**
  * INTERNAL: This module contains the fully generated definition of `MatchExpr` and should not
@@ -16,19 +17,6 @@ import codeql.rust.elements.MatchArm
  */
 module Generated {
   /**
-   * A match expression. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) => y,
-   *     Option::None => 0,
-   * }
-   * ```
-   * ```
-   * match x {
-   *     Some(y) if y != 0 => 1 / y,
-   *     _ => 0,
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::MatchExpr` class directly.
    * Use the subclass `MatchExpr`, where the following predicates are available.
    */
@@ -36,31 +24,49 @@ module Generated {
     override string getAPrimaryQlClass() { result = "MatchExpr" }
 
     /**
-     * Gets the expression of this match expression.
+     * Gets the `index`th attr of this match expression (0-based).
      */
-    Expr getExpr() {
+    Attr getAttr(int index) {
       result =
-        Synth::convertExprFromRaw(Synth::convertMatchExprToRaw(this).(Raw::MatchExpr).getExpr())
+        Synth::convertAttrFromRaw(Synth::convertMatchExprToRaw(this).(Raw::MatchExpr).getAttr(index))
     }
 
     /**
-     * Gets the `index`th branch of this match expression (0-based).
+     * Gets any of the attrs of this match expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this match expression.
      */
-    MatchArm getBranch(int index) {
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this match expression, if it exists.
+     */
+    Expr getExpr() {
       result =
-        Synth::convertMatchArmFromRaw(Synth::convertMatchExprToRaw(this)
-              .(Raw::MatchExpr)
-              .getBranch(index))
+        Synth::convertExprFromRaw(Synth::convertMatchExprToRaw(this).(Raw::MatchExpr).getExpr())
     }
 
     /**
-     * Gets any of the branches of this match expression.
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the match arm list of this match expression, if it exists.
      */
-    final MatchArm getABranch() { result = this.getBranch(_) }
+    MatchArmList getMatchArmList() {
+      result =
+        Synth::convertMatchArmListFromRaw(Synth::convertMatchExprToRaw(this)
+              .(Raw::MatchExpr)
+              .getMatchArmList())
+    }
 
     /**
-     * Gets the number of branches of this match expression.
+     * Holds if `getMatchArmList()` exists.
      */
-    final int getNumberOfBranches() { result = count(int i | exists(this.getBranch(i))) }
+    final predicate hasMatchArmList() { exists(this.getMatchArmList()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchGuard.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchGuard.qll
new file mode 100644
index 0000000000000..ac6e87a2a6123
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchGuard.qll
@@ -0,0 +1,39 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MatchGuard`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Expr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MatchGuard` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::MatchGuard` class directly.
+   * Use the subclass `MatchGuard`, where the following predicates are available.
+   */
+  class MatchGuard extends Synth::TMatchGuard, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "MatchGuard" }
+
+    /**
+     * Gets the condition of this match guard, if it exists.
+     */
+    Expr getCondition() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertMatchGuardToRaw(this)
+              .(Raw::MatchGuard)
+              .getCondition())
+    }
+
+    /**
+     * Holds if `getCondition()` exists.
+     */
+    final predicate hasCondition() { exists(this.getCondition()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll
new file mode 100644
index 0000000000000..93ee1770d9cf7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Meta.qll
@@ -0,0 +1,63 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Meta`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Path
+import codeql.rust.elements.TokenTree
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Meta` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Meta` class directly.
+   * Use the subclass `Meta`, where the following predicates are available.
+   */
+  class Meta extends Synth::TMeta, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Meta" }
+
+    /**
+     * Gets the expression of this meta, if it exists.
+     */
+    Expr getExpr() {
+      result = Synth::convertExprFromRaw(Synth::convertMetaToRaw(this).(Raw::Meta).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the path of this meta, if it exists.
+     */
+    Path getPath() {
+      result = Synth::convertPathFromRaw(Synth::convertMetaToRaw(this).(Raw::Meta).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+
+    /**
+     * Gets the token tree of this meta, if it exists.
+     */
+    TokenTree getTokenTree() {
+      result =
+        Synth::convertTokenTreeFromRaw(Synth::convertMetaToRaw(this).(Raw::Meta).getTokenTree())
+    }
+
+    /**
+     * Holds if `getTokenTree()` exists.
+     */
+    final predicate hasTokenTree() { exists(this.getTokenTree()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
index 08783a714d832..e6fd4b6fe8f51 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
@@ -6,9 +6,12 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.ArgList
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
 
 /**
  * INTERNAL: This module contains the fully generated definition of `MethodCallExpr` and should not
@@ -16,10 +19,6 @@ import codeql.rust.elements.GenericArgList
  */
 module Generated {
   /**
-   * A method call expression. For example:
-   * ```
-   * x.foo(42);
-   * x.foo::<u32, u64>(42);
    * INTERNAL: Do not reference the `Generated::MethodCallExpr` class directly.
    * Use the subclass `MethodCallExpr`, where the following predicates are available.
    */
@@ -27,55 +26,83 @@ module Generated {
     override string getAPrimaryQlClass() { result = "MethodCallExpr" }
 
     /**
-     * Gets the receiver of this method call expression.
+     * Gets the argument list of this method call expression, if it exists.
      */
-    Expr getReceiver() {
+    ArgList getArgList() {
       result =
-        Synth::convertExprFromRaw(Synth::convertMethodCallExprToRaw(this)
+        Synth::convertArgListFromRaw(Synth::convertMethodCallExprToRaw(this)
               .(Raw::MethodCallExpr)
-              .getReceiver())
+              .getArgList())
     }
 
     /**
-     * Gets the method name of this method call expression.
+     * Holds if `getArgList()` exists.
      */
-    string getMethodName() {
-      result = Synth::convertMethodCallExprToRaw(this).(Raw::MethodCallExpr).getMethodName()
-    }
+    final predicate hasArgList() { exists(this.getArgList()) }
 
     /**
-     * Gets the `index`th argument of this method call expression (0-based).
+     * Gets the `index`th attr of this method call expression (0-based).
      */
-    Expr getArg(int index) {
+    Attr getAttr(int index) {
       result =
-        Synth::convertExprFromRaw(Synth::convertMethodCallExprToRaw(this)
+        Synth::convertAttrFromRaw(Synth::convertMethodCallExprToRaw(this)
               .(Raw::MethodCallExpr)
-              .getArg(index))
+              .getAttr(index))
     }
 
     /**
-     * Gets any of the arguments of this method call expression.
+     * Gets any of the attrs of this method call expression.
      */
-    final Expr getAnArg() { result = this.getArg(_) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of arguments of this method call expression.
+     * Gets the number of attrs of this method call expression.
      */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the generic arguments of this method call expression, if it exists.
+     * Gets the generic argument list of this method call expression, if it exists.
      */
-    GenericArgList getGenericArgs() {
+    GenericArgList getGenericArgList() {
       result =
         Synth::convertGenericArgListFromRaw(Synth::convertMethodCallExprToRaw(this)
               .(Raw::MethodCallExpr)
-              .getGenericArgs())
+              .getGenericArgList())
+    }
+
+    /**
+     * Holds if `getGenericArgList()` exists.
+     */
+    final predicate hasGenericArgList() { exists(this.getGenericArgList()) }
+
+    /**
+     * Gets the name reference of this method call expression, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertMethodCallExprToRaw(this)
+              .(Raw::MethodCallExpr)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
+
+    /**
+     * Gets the receiver of this method call expression, if it exists.
+     */
+    Expr getReceiver() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertMethodCallExprToRaw(this)
+              .(Raw::MethodCallExpr)
+              .getReceiver())
     }
 
     /**
-     * Holds if `getGenericArgs()` exists.
+     * Holds if `getReceiver()` exists.
      */
-    final predicate hasGenericArgs() { exists(this.getGenericArgs()) }
+    final predicate hasReceiver() { exists(this.getReceiver()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll
index 90c51020d2d68..9eff62a26c46d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Missing.qll
@@ -18,5 +18,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Missing` class directly.
    * Use the subclass `Missing`, where the following predicates are available.
    */
-  class Missing extends Synth::TMissing, UnextractedImpl::Unextracted { }
+  class Missing extends Synth::TMissing, UnextractedImpl::Unextracted {
+    override string getAPrimaryQlClass() { result = "Missing" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MissingExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MissingExpr.qll
deleted file mode 100644
index c2bace6b03056..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MissingExpr.qll
+++ /dev/null
@@ -1,29 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `MissingExpr`.
- * 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.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.internal.MissingImpl::Impl as MissingImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `MissingExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A missing expression, used as a placeholder for incomplete syntax.
-   *
-   * ```
-   * let x = non_existing_macro!();
-   * ```
-   * INTERNAL: Do not reference the `Generated::MissingExpr` class directly.
-   * Use the subclass `MissingExpr`, where the following predicates are available.
-   */
-  class MissingExpr extends Synth::TMissingExpr, ExprImpl::Expr, MissingImpl::Missing {
-    override string getAPrimaryQlClass() { result = "MissingExpr" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MissingPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MissingPat.qll
deleted file mode 100644
index 5b3f87fcd5506..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MissingPat.qll
+++ /dev/null
@@ -1,30 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `MissingPat`.
- * 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.MissingImpl::Impl as MissingImpl
-import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `MissingPat` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A missing pattern, used as a place holder for incomplete syntax.
-   * ```
-   * match Some(42) {
-   *     .. => "bad use of .. syntax",
-   * };
-   * ```
-   * INTERNAL: Do not reference the `Generated::MissingPat` class directly.
-   * Use the subclass `MissingPat`, where the following predicates are available.
-   */
-  class MissingPat extends Synth::TMissingPat, PatImpl::Pat, MissingImpl::Missing {
-    override string getAPrimaryQlClass() { result = "MissingPat" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll
index 201a65876c57d..dc610d0f79d5d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Module.qll
@@ -6,8 +6,11 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Declaration
-import codeql.rust.elements.internal.DeclarationImpl::Impl as DeclarationImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.ItemList
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Module` and should not
@@ -15,39 +18,68 @@ import codeql.rust.elements.internal.DeclarationImpl::Impl as DeclarationImpl
  */
 module Generated {
   /**
-   * A module declaration. For example:
-   * ```
-   * mod foo;
-   * ```
-   * ```
-   * mod bar {
-   *     pub fn baz() {}
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::Module` class directly.
    * Use the subclass `Module`, where the following predicates are available.
    */
-  class Module extends Synth::TModule, DeclarationImpl::Declaration {
+  class Module extends Synth::TModule, ItemImpl::Item {
     override string getAPrimaryQlClass() { result = "Module" }
 
     /**
-     * Gets the `index`th declaration of this module (0-based).
+     * Gets the `index`th attr of this module (0-based).
      */
-    Declaration getDeclaration(int index) {
+    Attr getAttr(int index) {
       result =
-        Synth::convertDeclarationFromRaw(Synth::convertModuleToRaw(this)
-              .(Raw::Module)
-              .getDeclaration(index))
+        Synth::convertAttrFromRaw(Synth::convertModuleToRaw(this).(Raw::Module).getAttr(index))
     }
 
     /**
-     * Gets any of the declarations of this module.
+     * Gets any of the attrs of this module.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this module.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the item list of this module, if it exists.
      */
-    final Declaration getADeclaration() { result = this.getDeclaration(_) }
+    ItemList getItemList() {
+      result =
+        Synth::convertItemListFromRaw(Synth::convertModuleToRaw(this).(Raw::Module).getItemList())
+    }
+
+    /**
+     * Holds if `getItemList()` exists.
+     */
+    final predicate hasItemList() { exists(this.getItemList()) }
+
+    /**
+     * Gets the name of this module, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertModuleToRaw(this).(Raw::Module).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the visibility of this module, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertModuleToRaw(this)
+              .(Raw::Module)
+              .getVisibility())
+    }
 
     /**
-     * Gets the number of declarations of this module.
+     * Holds if `getVisibility()` exists.
      */
-    final int getNumberOfDeclarations() { result = count(int i | exists(this.getDeclaration(i))) }
+    final predicate hasVisibility() { exists(this.getVisibility()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Name.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Name.qll
new file mode 100644
index 0000000000000..23f588fad8915
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Name.qll
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Name`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Name` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Name` class directly.
+   * Use the subclass `Name`, where the following predicates are available.
+   */
+  class Name extends Synth::TName, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Name" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/NameRef.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/NameRef.qll
new file mode 100644
index 0000000000000..a7b5c5e1da60c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/NameRef.qll
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `NameRef`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `NameRef` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::NameRef` class directly.
+   * Use the subclass `NameRef`, where the following predicates are available.
+   */
+  class NameRef extends Synth::TNameRef, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "NameRef" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll
new file mode 100644
index 0000000000000..2317f2bde65d3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `NeverType`.
+ * 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.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `NeverType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::NeverType` class directly.
+   * Use the subclass `NeverType`, where the following predicates are available.
+   */
+  class NeverType extends Synth::TNeverType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "NeverType" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
index e5bb424313ce6..e8bdada6530cc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
@@ -6,8 +6,10 @@
 
 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.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.Type
 
 /**
  * INTERNAL: This module contains the fully generated definition of `OffsetOfExpr` and should not
@@ -15,10 +17,6 @@ import codeql.rust.elements.TypeRef
  */
 module Generated {
   /**
-   *  An `offset_of` expression. For example:
-   * ```
-   * builtin # offset_of(Struct, field);
-   * ```
    * INTERNAL: Do not reference the `Generated::OffsetOfExpr` class directly.
    * Use the subclass `OffsetOfExpr`, where the following predicates are available.
    */
@@ -26,30 +24,56 @@ module Generated {
     override string getAPrimaryQlClass() { result = "OffsetOfExpr" }
 
     /**
-     * Gets the container of this offset of expression.
+     * Gets the `index`th attr of this offset of expression (0-based).
      */
-    TypeRef getContainer() {
+    Attr getAttr(int index) {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertOffsetOfExprToRaw(this)
+        Synth::convertAttrFromRaw(Synth::convertOffsetOfExprToRaw(this)
               .(Raw::OffsetOfExpr)
-              .getContainer())
+              .getAttr(index))
     }
 
+    /**
+     * Gets any of the attrs of this offset of expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this offset of expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the `index`th field of this offset of expression (0-based).
      */
-    string getField(int index) {
-      result = Synth::convertOffsetOfExprToRaw(this).(Raw::OffsetOfExpr).getField(index)
+    NameRef getField(int index) {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertOffsetOfExprToRaw(this)
+              .(Raw::OffsetOfExpr)
+              .getField(index))
     }
 
     /**
      * Gets any of the fields of this offset of expression.
      */
-    final string getAField() { result = this.getField(_) }
+    final NameRef getAField() { result = this.getField(_) }
 
     /**
      * Gets the number of fields of this offset of expression.
      */
     final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+
+    /**
+     * Gets the ty of this offset of expression, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertOffsetOfExprToRaw(this).(Raw::OffsetOfExpr).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
index 8fbb1203cea4e..264f95b326fd6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
@@ -15,12 +15,6 @@ import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
  */
 module Generated {
   /**
-   * An or pattern. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) | Option::None => 0,
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::OrPat` class directly.
    * Use the subclass `OrPat`, where the following predicates are available.
    */
@@ -28,20 +22,20 @@ module Generated {
     override string getAPrimaryQlClass() { result = "OrPat" }
 
     /**
-     * Gets the `index`th argument of this or pat (0-based).
+     * Gets the `index`th pat of this or pat (0-based).
      */
-    Pat getArg(int index) {
-      result = Synth::convertPatFromRaw(Synth::convertOrPatToRaw(this).(Raw::OrPat).getArg(index))
+    Pat getPat(int index) {
+      result = Synth::convertPatFromRaw(Synth::convertOrPatToRaw(this).(Raw::OrPat).getPat(index))
     }
 
     /**
-     * Gets any of the arguments of this or pat.
+     * Gets any of the pats of this or pat.
      */
-    final Pat getAnArg() { result = this.getArg(_) }
+    final Pat getAPat() { result = this.getPat(_) }
 
     /**
-     * Gets the number of arguments of this or pat.
+     * Gets the number of pats of this or pat.
      */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
+    final int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll
new file mode 100644
index 0000000000000..11f2f317929fb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll
@@ -0,0 +1,67 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Param`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Pat
+import codeql.rust.elements.Type
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Param` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Param` class directly.
+   * Use the subclass `Param`, where the following predicates are available.
+   */
+  class Param extends Synth::TParam, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Param" }
+
+    /**
+     * Gets the `index`th attr of this parameter (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertParamToRaw(this).(Raw::Param).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this parameter.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this parameter.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the pat of this parameter, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertParamToRaw(this).(Raw::Param).getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
+
+    /**
+     * Gets the ty of this parameter, if it exists.
+     */
+    Type getTy() {
+      result = Synth::convertTypeFromRaw(Synth::convertParamToRaw(this).(Raw::Param).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParamList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamList.qll
new file mode 100644
index 0000000000000..032b6c0c63edd
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamList.qll
@@ -0,0 +1,60 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ParamList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Param
+import codeql.rust.elements.SelfParam
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ParamList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ParamList` class directly.
+   * Use the subclass `ParamList`, where the following predicates are available.
+   */
+  class ParamList extends Synth::TParamList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ParamList" }
+
+    /**
+     * Gets the `index`th parameter of this parameter list (0-based).
+     */
+    Param getParam(int index) {
+      result =
+        Synth::convertParamFromRaw(Synth::convertParamListToRaw(this)
+              .(Raw::ParamList)
+              .getParam(index))
+    }
+
+    /**
+     * Gets any of the parameters of this parameter list.
+     */
+    final Param getAParam() { result = this.getParam(_) }
+
+    /**
+     * Gets the number of parameters of this parameter list.
+     */
+    final int getNumberOfParams() { result = count(int i | exists(this.getParam(i))) }
+
+    /**
+     * Gets the self parameter of this parameter list, if it exists.
+     */
+    SelfParam getSelfParam() {
+      result =
+        Synth::convertSelfParamFromRaw(Synth::convertParamListToRaw(this)
+              .(Raw::ParamList)
+              .getSelfParam())
+    }
+
+    /**
+     * Holds if `getSelfParam()` exists.
+     */
+    final predicate hasSelfParam() { exists(this.getSelfParam()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenExpr.qll
new file mode 100644
index 0000000000000..11d471701f123
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenExpr.qll
@@ -0,0 +1,56 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ParenExpr`.
+ * 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.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ParenExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ParenExpr` class directly.
+   * Use the subclass `ParenExpr`, where the following predicates are available.
+   */
+  class ParenExpr extends Synth::TParenExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "ParenExpr" }
+
+    /**
+     * Gets the `index`th attr of this paren expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertParenExprToRaw(this).(Raw::ParenExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this paren expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this paren expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this paren expression, if it exists.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertParenExprToRaw(this).(Raw::ParenExpr).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
new file mode 100644
index 0000000000000..be611d93f2d84
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
@@ -0,0 +1,36 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ParenPat`.
+ * 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.Pat
+import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ParenPat` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ParenPat` class directly.
+   * Use the subclass `ParenPat`, where the following predicates are available.
+   */
+  class ParenPat extends Synth::TParenPat, PatImpl::Pat {
+    override string getAPrimaryQlClass() { result = "ParenPat" }
+
+    /**
+     * Gets the pat of this paren pat, if it exists.
+     */
+    Pat getPat() {
+      result = Synth::convertPatFromRaw(Synth::convertParenPatToRaw(this).(Raw::ParenPat).getPat())
+    }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll
new file mode 100644
index 0000000000000..59362c46a32e6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll
@@ -0,0 +1,37 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ParenType`.
+ * 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.Type
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ParenType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ParenType` class directly.
+   * Use the subclass `ParenType`, where the following predicates are available.
+   */
+  class ParenType extends Synth::TParenType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "ParenType" }
+
+    /**
+     * Gets the ty of this paren type, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertParenTypeToRaw(this).(Raw::ParenType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
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 53d573b1f95a6..e597efbde8a2b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -81,185 +81,1277 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfDeclaration(
-    Declaration e, int index, string partialPredicateCall
+  private Element getImmediateChildOfAbi(Abi e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfAdt(Adt e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfArgList(ArgList e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfAssocItem(AssocItem e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfAssocItemList(
+    AssocItemList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfAttr(Attr e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfClosureBinder(
+    ClosureBinder e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfExpr(Expr e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfExternItem(ExternItem e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfExternItemList(
+    ExternItemList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfFieldList(FieldList e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfFormatArgsArg(
+    FormatArgsArg e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfGenericArg(GenericArg e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfGenericArgList(
+    GenericArgList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfGenericParam(
+    GenericParam e, int index, string partialPredicateCall
   ) {
     exists(int b, int bAstNode, int n |
       b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      n = bAstNode and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfGenericParamList(
+    GenericParamList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfItemList(ItemList e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLabel(Label e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLetElse(LetElse e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLifetime(Lifetime e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMacroItems(MacroItems e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMacroStmts(MacroStmts e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMatchArm(MatchArm e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMatchArmList(
+    MatchArmList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMatchGuard(MatchGuard e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfMeta(Meta e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfName(Name e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfNameRef(NameRef e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfParam(Param e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfParamList(ParamList e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfPat(Pat e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfPath(Path e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfPathSegment(
+    PathSegment e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRecordExprField(
+    RecordExprField e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRecordExprFieldList(
+    RecordExprFieldList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRecordField(
+    RecordField e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRecordPatField(
+    RecordPatField e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRecordPatFieldList(
+    RecordPatFieldList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRename(Rename e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRetType(RetType e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfReturnTypeSyntax(
+    ReturnTypeSyntax e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfSelfParam(SelfParam e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfSourceFile(SourceFile e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfStmt(Stmt e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfStmtList(StmtList e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTokenTree(TokenTree e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTupleField(TupleField e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfType(Type e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTypeBound(TypeBound e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfTypeBoundList(
+    TypeBoundList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfUseTree(UseTree e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfUseTreeList(
+    UseTreeList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfVariant(Variant e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfVariantList(
+    VariantList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfVisibility(Visibility e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfWhereClause(
+    WhereClause e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfWherePred(WherePred e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfArrayExpr(ArrayExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfArrayType(ArrayType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
+      b = 0 and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
+      (
+        none()
+        or
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfAsmExpr(AsmExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfAssocTypeArg(
+    AssocTypeArg e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bGenericArg, int n |
+      b = 0 and
+      bGenericArg =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericArg(e, i, _)) | i) and
+      n = bGenericArg and
+      (
+        none()
+        or
+        result = getImmediateChildOfGenericArg(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfAwaitExpr(AwaitExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfBecomeExpr(BecomeExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfBinaryExpr(BinaryExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfBlockExpr(BlockExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfBoxPat(BoxPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
+      b = 0 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
+      (
+        none()
+        or
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfBreakExpr(BreakExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfCallExpr(CallExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfCastExpr(CastExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfClosureExpr(
+    ClosureExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfConstArg(ConstArg e, int index, string partialPredicateCall) {
+    exists(int b, int bGenericArg, int n |
+      b = 0 and
+      bGenericArg =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericArg(e, i, _)) | i) and
+      n = bGenericArg and
+      (
+        none()
+        or
+        result = getImmediateChildOfGenericArg(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfConstBlockPat(
+    ConstBlockPat e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bPat, int n |
+      b = 0 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
+      (
+        none()
+        or
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfConstParam(ConstParam e, int index, string partialPredicateCall) {
+    exists(int b, int bGenericParam, int n |
+      b = 0 and
+      bGenericParam =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericParam(e, i, _)) | i) and
+      n = bGenericParam and
+      (
+        none()
+        or
+        result = getImmediateChildOfGenericParam(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfContinueExpr(
+    ContinueExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfDynTraitType(
+    DynTraitType e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bType, int n |
+      b = 0 and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
+      (
+        none()
+        or
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfExprStmt(ExprStmt e, int index, string partialPredicateCall) {
+    exists(int b, int bStmt, int n |
+      b = 0 and
+      bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
+      n = bStmt and
+      (
+        none()
+        or
+        result = getImmediateChildOfStmt(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfFieldExpr(FieldExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfFnPtrType(FnPtrType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
+      b = 0 and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
+      (
+        none()
+        or
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfForExpr(ForExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfForType(ForType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
+      b = 0 and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
+      (
+        none()
+        or
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfFormatArgsExpr(
+    FormatArgsExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfIdentPat(IdentPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
+      b = 0 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
+      (
+        none()
+        or
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfIfExpr(IfExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
       (
         none()
         or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfExpr(Expr e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n |
+  private Element getImmediateChildOfImplTraitType(
+    ImplTraitType e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bType, int n |
       b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      n = bAstNode and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
       (
         none()
         or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfGenericArgList(
-    GenericArgList e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bAstNode, int bUnimplemented, int n |
+  private Element getImmediateChildOfIndexExpr(IndexExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      bUnimplemented =
-        bAstNode + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnimplemented(e, i, _)) | i) and
-      n = bUnimplemented and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
       (
         none()
         or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfUnimplemented(e, index - bAstNode, partialPredicateCall)
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfLabel(Label e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n |
+  private Element getImmediateChildOfInferType(InferType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
       b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      n = bAstNode and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
       (
         none()
         or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfMatchArm(MatchArm e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nPat, int nGuard, int nExpr |
+  private Element getImmediateChildOfItem(Item e, int index, string partialPredicateCall) {
+    exists(int b, int bStmt, int n |
       b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      n = bAstNode and
-      nPat = n + 1 and
-      nGuard = nPat + 1 and
-      nExpr = nGuard + 1 and
+      bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
+      n = bStmt and
       (
         none()
         or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
-        or
-        index = nPat and result = e.getGuard() and partialPredicateCall = "Guard()"
-        or
-        index = nGuard and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfStmt(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfPat(Pat e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n |
+  private Element getImmediateChildOfLetExpr(LetExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      n = bAstNode and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
       (
         none()
         or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfPath(Path e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int bUnimplemented, int n |
+  private Element getImmediateChildOfLetStmt(LetStmt e, int index, string partialPredicateCall) {
+    exists(int b, int bStmt, int n |
       b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      bUnimplemented =
-        bAstNode + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnimplemented(e, i, _)) | i) and
-      n = bUnimplemented and
+      bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
+      n = bStmt and
       (
         none()
         or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfUnimplemented(e, index - bAstNode, partialPredicateCall)
+        result = getImmediateChildOfStmt(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfRecordExprField(
-    RecordExprField e, int index, string partialPredicateCall
+  private Element getImmediateChildOfLifetimeArg(
+    LifetimeArg e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bAstNode, int n, int nExpr |
+    exists(int b, int bGenericArg, int n |
       b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      n = bAstNode and
-      nExpr = n + 1 and
+      bGenericArg =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericArg(e, i, _)) | i) and
+      n = bGenericArg and
       (
         none()
         or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfGenericArg(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfRecordPatField(
-    RecordPatField e, int index, string partialPredicateCall
+  private Element getImmediateChildOfLifetimeParam(
+    LifetimeParam e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bAstNode, int n, int nPat |
+    exists(int b, int bGenericParam, int n |
       b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      n = bAstNode and
-      nPat = n + 1 and
+      bGenericParam =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericParam(e, i, _)) | i) and
+      n = bGenericParam and
       (
         none()
         or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+        result = getImmediateChildOfGenericParam(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfStmt(Stmt e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n |
+  private Element getImmediateChildOfLiteral(Literal e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      n = bAstNode and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
       (
         none()
         or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfTypeRef(TypeRef e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int bUnimplemented, int n |
+  private Element getImmediateChildOfLiteralPat(LiteralPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
       b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      bUnimplemented =
-        bAstNode + 1 + max(int i | i = -1 or exists(getImmediateChildOfUnimplemented(e, i, _)) | i) and
-      n = bUnimplemented and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
       (
         none()
         or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfUnimplemented(e, index - bAstNode, partialPredicateCall)
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfArrayExpr(ArrayExpr e, int index, string partialPredicateCall) {
+  private Element getImmediateChildOfLoopExpr(LoopExpr e, int index, string partialPredicateCall) {
     exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
@@ -272,432 +1364,338 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfAsmExpr(AsmExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfMacroExpr(MacroExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
 
-  private Element getImmediateChildOfAwaitExpr(AwaitExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfMacroPat(MacroPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfBecomeExpr(BecomeExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfMacroType(MacroType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfBinaryExpr(BinaryExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nLhs, int nRhs |
+  private Element getImmediateChildOfMatchExpr(MatchExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nLhs = n + 1 and
-      nRhs = nLhs + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getLhs() and partialPredicateCall = "Lhs()"
-        or
-        index = nLhs and result = e.getRhs() and partialPredicateCall = "Rhs()"
       )
     )
   }
 
-  private Element getImmediateChildOfBlockExprBase(
-    BlockExprBase e, int index, string partialPredicateCall
+  private Element getImmediateChildOfMethodCallExpr(
+    MethodCallExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n, int nStatement, int nTail |
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nStatement = n + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
-      nTail = nStatement + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfNeverType(NeverType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
+      b = 0 and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
+      (
+        none()
         or
-        result = e.getStatement(index - n) and
-        partialPredicateCall = "Statement(" + (index - n).toString() + ")"
-        or
-        index = nStatement and result = e.getTail() and partialPredicateCall = "Tail()"
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfBoxExpr(BoxExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfOffsetOfExpr(
+    OffsetOfExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
 
-  private Element getImmediateChildOfBoxPat(BoxPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nInner |
+  private Element getImmediateChildOfOrPat(OrPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
-      nInner = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getInner() and partialPredicateCall = "Inner()"
       )
     )
   }
 
-  private Element getImmediateChildOfBreakExpr(BreakExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr, int nLabel |
+  private Element getImmediateChildOfParenExpr(ParenExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
-      nLabel = nExpr + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
-        or
-        index = nExpr and result = e.getLabel() and partialPredicateCall = "Label()"
       )
     )
   }
 
-  private Element getImmediateChildOfCallExpr(CallExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nCallee, int nArg |
+  private Element getImmediateChildOfParenPat(ParenPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nCallee = n + 1 and
-      nArg = nCallee + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getCallee() and partialPredicateCall = "Callee()"
-        or
-        result = e.getArg(index - nCallee) and
-        partialPredicateCall = "Arg(" + (index - nCallee).toString() + ")"
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfCastExpr(CastExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr, int nType |
+  private Element getImmediateChildOfParenType(ParenType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
-      nType = nExpr + 1 and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
-        or
-        index = nExpr and result = e.getType() and partialPredicateCall = "Type()"
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfClosureExpr(
-    ClosureExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int n, int nArg, int nArgType, int nRetType, int nBody |
+  private Element getImmediateChildOfPathExpr(PathExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nArg = n + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
-      nArgType = nArg + 1 + max(int i | i = -1 or exists(e.getArgType(i)) | i) and
-      nRetType = nArgType + 1 and
-      nBody = nRetType + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        result = e.getArg(index - n) and
-        partialPredicateCall = "Arg(" + (index - n).toString() + ")"
-        or
-        result = e.getArgType(index - nArg) and
-        partialPredicateCall = "ArgType(" + (index - nArg).toString() + ")"
-        or
-        index = nArgType and result = e.getRetType() and partialPredicateCall = "RetType()"
-        or
-        index = nRetType and result = e.getBody() and partialPredicateCall = "Body()"
       )
     )
   }
 
-  private Element getImmediateChildOfConstBlockPat(
-    ConstBlockPat e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bPat, int n, int nExpr |
+  private Element getImmediateChildOfPathPat(PathPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
-      nExpr = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
 
-  private Element getImmediateChildOfConstExpr(ConstExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfPathType(PathType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfContinueExpr(
-    ContinueExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int n, int nLabel |
+  private Element getImmediateChildOfPrefixExpr(PrefixExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nLabel = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getLabel() and partialPredicateCall = "Label()"
       )
     )
   }
 
-  private Element getImmediateChildOfExprStmt(ExprStmt e, int index, string partialPredicateCall) {
-    exists(int b, int bStmt, int n, int nExpr |
+  private Element getImmediateChildOfPtrType(PtrType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
       b = 0 and
-      bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
-      n = bStmt and
-      nExpr = n + 1 and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
       (
         none()
         or
-        result = getImmediateChildOfStmt(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfFieldExpr(FieldExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfRangeExpr(RangeExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
 
-  private Element getImmediateChildOfFunction(Function e, int index, string partialPredicateCall) {
-    exists(int b, int bDeclaration, int n, int nBody |
+  private Element getImmediateChildOfRangePat(RangePat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
       b = 0 and
-      bDeclaration =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfDeclaration(e, i, _)) | i) and
-      n = bDeclaration and
-      nBody = n + 1 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
       (
         none()
         or
-        result = getImmediateChildOfDeclaration(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getBody() and partialPredicateCall = "Body()"
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfIdentPat(IdentPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nSubpat |
+  private Element getImmediateChildOfRecordExpr(RecordExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      n = bPat and
-      nSubpat = n + 1 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
       (
         none()
         or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getSubpat() and partialPredicateCall = "Subpat()"
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfIfExpr(IfExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nCondition, int nThen, int nElse |
+  private Element getImmediateChildOfRecordFieldList(
+    RecordFieldList e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bFieldList, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nCondition = n + 1 and
-      nThen = nCondition + 1 and
-      nElse = nThen + 1 and
+      bFieldList = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfFieldList(e, i, _)) | i) and
+      n = bFieldList and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getCondition() and partialPredicateCall = "Condition()"
-        or
-        index = nCondition and result = e.getThen() and partialPredicateCall = "Then()"
+        result = getImmediateChildOfFieldList(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfRecordPat(RecordPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
+      b = 0 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
+      (
+        none()
         or
-        index = nThen and result = e.getElse() and partialPredicateCall = "Else()"
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfIndexExpr(IndexExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nBase, int nIndex |
+  private Element getImmediateChildOfRefExpr(RefExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nBase = n + 1 and
-      nIndex = nBase + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getBase() and partialPredicateCall = "Base()"
-        or
-        index = nBase and result = e.getIndex() and partialPredicateCall = "Index()"
       )
     )
   }
 
-  private Element getImmediateChildOfItemStmt(ItemStmt e, int index, string partialPredicateCall) {
-    exists(int b, int bStmt, int n |
+  private Element getImmediateChildOfRefPat(RefPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
       b = 0 and
-      bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
-      n = bStmt and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
       (
         none()
         or
-        result = getImmediateChildOfStmt(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfLetExpr(LetExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nPat, int nExpr |
+  private Element getImmediateChildOfRefType(RefType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nPat = n + 1 and
-      nExpr = nPat + 1 and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
-        or
-        index = nPat and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfLetStmt(LetStmt e, int index, string partialPredicateCall) {
-    exists(int b, int bStmt, int n, int nPat, int nType, int nInitializer, int nElse |
+  private Element getImmediateChildOfRestPat(RestPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
       b = 0 and
-      bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
-      n = bStmt and
-      nPat = n + 1 and
-      nType = nPat + 1 and
-      nInitializer = nType + 1 and
-      nElse = nInitializer + 1 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
       (
         none()
         or
-        result = getImmediateChildOfStmt(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
-        or
-        index = nPat and result = e.getType() and partialPredicateCall = "Type()"
-        or
-        index = nType and result = e.getInitializer() and partialPredicateCall = "Initializer()"
-        or
-        index = nInitializer and result = e.getElse() and partialPredicateCall = "Else()"
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfLiteralExpr(
-    LiteralExpr e, int index, string partialPredicateCall
-  ) {
+  private Element getImmediateChildOfReturnExpr(ReturnExpr e, int index, string partialPredicateCall) {
     exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
@@ -710,596 +1708,469 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfLiteralPat(LiteralPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nExpr |
+  private Element getImmediateChildOfSlicePat(SlicePat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
-      nExpr = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
 
-  private Element getImmediateChildOfLoopExpr(LoopExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nBody, int nLabel |
+  private Element getImmediateChildOfSliceType(SliceType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nBody = n + 1 and
-      nLabel = nBody + 1 and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getBody() and partialPredicateCall = "Body()"
-        or
-        index = nBody and result = e.getLabel() and partialPredicateCall = "Label()"
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfMatchExpr(MatchExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr, int nBranch |
+  private Element getImmediateChildOfTryExpr(TryExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
-      nBranch = nExpr + 1 + max(int i | i = -1 or exists(e.getBranch(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
-        or
-        result = e.getBranch(index - nExpr) and
-        partialPredicateCall = "Branch(" + (index - nExpr).toString() + ")"
       )
     )
   }
 
-  private Element getImmediateChildOfMethodCallExpr(
-    MethodCallExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int n, int nReceiver, int nArg, int nGenericArgs |
+  private Element getImmediateChildOfTupleExpr(TupleExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nReceiver = n + 1 and
-      nArg = nReceiver + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
-      nGenericArgs = nArg + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getReceiver() and partialPredicateCall = "Receiver()"
-        or
-        result = e.getArg(index - nReceiver) and
-        partialPredicateCall = "Arg(" + (index - nReceiver).toString() + ")"
-        or
-        index = nArg and result = e.getGenericArgs() and partialPredicateCall = "GenericArgs()"
       )
     )
   }
 
-  private Element getImmediateChildOfMissingExpr(
-    MissingExpr e, int index, string partialPredicateCall
+  private Element getImmediateChildOfTupleFieldList(
+    TupleFieldList e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int bMissing, int n |
+    exists(int b, int bFieldList, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      bMissing = bExpr + 1 + max(int i | i = -1 or exists(getImmediateChildOfMissing(e, i, _)) | i) and
-      n = bMissing and
+      bFieldList = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfFieldList(e, i, _)) | i) and
+      n = bFieldList and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfMissing(e, index - bExpr, partialPredicateCall)
+        result = getImmediateChildOfFieldList(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfMissingPat(MissingPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int bMissing, int n |
+  private Element getImmediateChildOfTuplePat(TuplePat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      bMissing = bPat + 1 + max(int i | i = -1 or exists(getImmediateChildOfMissing(e, i, _)) | i) and
-      n = bMissing and
+      n = bPat and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfMissing(e, index - bPat, partialPredicateCall)
-      )
-    )
-  }
-
-  private Element getImmediateChildOfModule(Module e, int index, string partialPredicateCall) {
-    exists(int b, int bDeclaration, int n, int nDeclaration |
-      b = 0 and
-      bDeclaration =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfDeclaration(e, i, _)) | i) and
-      n = bDeclaration and
-      nDeclaration = n + 1 + max(int i | i = -1 or exists(e.getDeclaration(i)) | i) and
-      (
-        none()
-        or
-        result = getImmediateChildOfDeclaration(e, index - b, partialPredicateCall)
-        or
-        result = e.getDeclaration(index - n) and
-        partialPredicateCall = "Declaration(" + (index - n).toString() + ")"
       )
     )
   }
 
-  private Element getImmediateChildOfOffsetOfExpr(
-    OffsetOfExpr e, int index, string partialPredicateCall
+  private Element getImmediateChildOfTupleStructPat(
+    TupleStructPat e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n, int nContainer |
+    exists(int b, int bPat, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nContainer = n + 1 and
+      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
+      n = bPat and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getContainer() and partialPredicateCall = "Container()"
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfOrPat(OrPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nArg |
+  private Element getImmediateChildOfTupleType(TupleType e, int index, string partialPredicateCall) {
+    exists(int b, int bType, int n |
       b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      n = bPat and
-      nArg = n + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
+      bType = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfType(e, i, _)) | i) and
+      n = bType and
       (
         none()
         or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        result = e.getArg(index - n) and
-        partialPredicateCall = "Arg(" + (index - n).toString() + ")"
+        result = getImmediateChildOfType(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfPathExpr(PathExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nPath |
+  private Element getImmediateChildOfTypeArg(TypeArg e, int index, string partialPredicateCall) {
+    exists(int b, int bGenericArg, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nPath = n + 1 and
+      bGenericArg =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericArg(e, i, _)) | i) and
+      n = bGenericArg and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        result = getImmediateChildOfGenericArg(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfPathPat(PathPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nPath |
+  private Element getImmediateChildOfTypeParam(TypeParam e, int index, string partialPredicateCall) {
+    exists(int b, int bGenericParam, int n |
       b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      n = bPat and
-      nPath = n + 1 and
+      bGenericParam =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericParam(e, i, _)) | i) and
+      n = bGenericParam and
       (
         none()
         or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        result = getImmediateChildOfGenericParam(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfPrefixExpr(PrefixExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfUnderscoreExpr(
+    UnderscoreExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nExpr = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
       )
     )
   }
 
-  private Element getImmediateChildOfRangeExpr(RangeExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nLhs, int nRhs |
+  private Element getImmediateChildOfWhileExpr(WhileExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nLhs = n + 1 and
-      nRhs = nLhs + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getLhs() and partialPredicateCall = "Lhs()"
-        or
-        index = nLhs and result = e.getRhs() and partialPredicateCall = "Rhs()"
       )
     )
   }
 
-  private Element getImmediateChildOfRangePat(RangePat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nStart, int nEnd |
+  private Element getImmediateChildOfWildcardPat(
+    WildcardPat e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bPat, int n |
       b = 0 and
       bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
       n = bPat and
-      nStart = n + 1 and
-      nEnd = nStart + 1 and
       (
         none()
         or
         result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getStart() and partialPredicateCall = "Start()"
-        or
-        index = nStart and result = e.getEnd() and partialPredicateCall = "End()"
       )
     )
   }
 
-  private Element getImmediateChildOfRecordExpr(RecordExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nPath, int nFld, int nSpread |
+  private Element getImmediateChildOfYeetExpr(YeetExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
-      nPath = n + 1 and
-      nFld = nPath + 1 + max(int i | i = -1 or exists(e.getFld(i)) | i) and
-      nSpread = nFld + 1 and
       (
         none()
         or
         result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
-        or
-        result = e.getFld(index - nPath) and
-        partialPredicateCall = "Fld(" + (index - nPath).toString() + ")"
-        or
-        index = nFld and result = e.getSpread() and partialPredicateCall = "Spread()"
       )
     )
   }
 
-  private Element getImmediateChildOfRecordPat(RecordPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nPath, int nFld |
+  private Element getImmediateChildOfYieldExpr(YieldExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n |
       b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      n = bPat and
-      nPath = n + 1 and
-      nFld = nPath + 1 + max(int i | i = -1 or exists(e.getFld(i)) | i) and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
       (
         none()
         or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
-        or
-        result = e.getFld(index - nPath) and
-        partialPredicateCall = "Fld(" + (index - nPath).toString() + ")"
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfRefExpr(RefExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfConst(Const e, int index, string partialPredicateCall) {
+    exists(int b, int bAssocItem, int bItem, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
+      bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
+      bItem = bAssocItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfAssocItem(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfItem(e, index - bAssocItem, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfRefPat(RefPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nPat |
+  private Element getImmediateChildOfEnum(Enum e, int index, string partialPredicateCall) {
+    exists(int b, int bAdt, int bItem, int n |
       b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      n = bPat and
-      nPat = n + 1 and
+      bAdt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAdt(e, i, _)) | i) and
+      bItem = bAdt + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfAdt(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+        result = getImmediateChildOfItem(e, index - bAdt, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfReturnExpr(ReturnExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfExternBlock(
+    ExternBlock e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bItem, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfSlicePat(SlicePat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nPrefix, int nSlice, int nSuffix |
+  private Element getImmediateChildOfExternCrate(
+    ExternCrate e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bItem, int n |
       b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      n = bPat and
-      nPrefix = n + 1 + max(int i | i = -1 or exists(e.getPrefix(i)) | i) and
-      nSlice = nPrefix + 1 and
-      nSuffix = nSlice + 1 + max(int i | i = -1 or exists(e.getSuffix(i)) | i) and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        result = e.getPrefix(index - n) and
-        partialPredicateCall = "Prefix(" + (index - n).toString() + ")"
-        or
-        index = nPrefix and result = e.getSlice() and partialPredicateCall = "Slice()"
-        or
-        result = e.getSuffix(index - nSlice) and
-        partialPredicateCall = "Suffix(" + (index - nSlice).toString() + ")"
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfTupleExpr(TupleExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfFn(Fn e, int index, string partialPredicateCall) {
+    exists(int b, int bAssocItem, int bExternItem, int bItem, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 + max(int i | i = -1 or exists(e.getExpr(i)) | i) and
+      bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
+      bExternItem =
+        bAssocItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfExternItem(e, i, _)) | i) and
+      bItem = bExternItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfAssocItem(e, index - b, partialPredicateCall)
         or
-        result = e.getExpr(index - n) and
-        partialPredicateCall = "Expr(" + (index - n).toString() + ")"
+        result = getImmediateChildOfExternItem(e, index - bAssocItem, partialPredicateCall)
+        or
+        result = getImmediateChildOfItem(e, index - bExternItem, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfTuplePat(TuplePat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nArg |
+  private Element getImmediateChildOfImpl(Impl e, int index, string partialPredicateCall) {
+    exists(int b, int bItem, int n |
       b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      n = bPat and
-      nArg = n + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        result = e.getArg(index - n) and
-        partialPredicateCall = "Arg(" + (index - n).toString() + ")"
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfTupleStructPat(
-    TupleStructPat e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bPat, int n, int nPath, int nArg |
+  private Element getImmediateChildOfMacroCall(MacroCall e, int index, string partialPredicateCall) {
+    exists(int b, int bAssocItem, int bExternItem, int bItem, int n |
       b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      n = bPat and
-      nPath = n + 1 and
-      nArg = nPath + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
+      bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
+      bExternItem =
+        bAssocItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfExternItem(e, i, _)) | i) and
+      bItem = bExternItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfAssocItem(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        result = getImmediateChildOfExternItem(e, index - bAssocItem, partialPredicateCall)
         or
-        result = e.getArg(index - nPath) and
-        partialPredicateCall = "Arg(" + (index - nPath).toString() + ")"
+        result = getImmediateChildOfItem(e, index - bExternItem, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfUnderscoreExpr(
-    UnderscoreExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int n |
+  private Element getImmediateChildOfMacroDef(MacroDef e, int index, string partialPredicateCall) {
+    exists(int b, int bItem, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfUnimplementedDeclaration(
-    UnimplementedDeclaration e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bDeclaration, int bUnimplemented, int n |
+  private Element getImmediateChildOfMacroRules(MacroRules e, int index, string partialPredicateCall) {
+    exists(int b, int bItem, int n |
       b = 0 and
-      bDeclaration =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfDeclaration(e, i, _)) | i) and
-      bUnimplemented =
-        bDeclaration + 1 +
-          max(int i | i = -1 or exists(getImmediateChildOfUnimplemented(e, i, _)) | i) and
-      n = bUnimplemented and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfDeclaration(e, index - b, partialPredicateCall)
-        or
-        result = getImmediateChildOfUnimplemented(e, index - bDeclaration, partialPredicateCall)
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfWildcardPat(
-    WildcardPat e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bPat, int n |
+  private Element getImmediateChildOfModule(Module e, int index, string partialPredicateCall) {
+    exists(int b, int bItem, int n |
       b = 0 and
-      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
-      n = bPat and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfYeetExpr(YeetExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfStatic(Static e, int index, string partialPredicateCall) {
+    exists(int b, int bExternItem, int bItem, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
+      bExternItem =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExternItem(e, i, _)) | i) and
+      bItem = bExternItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfExternItem(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfItem(e, index - bExternItem, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfYieldExpr(YieldExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr |
+  private Element getImmediateChildOfStruct(Struct e, int index, string partialPredicateCall) {
+    exists(int b, int bAdt, int bItem, int n |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nExpr = n + 1 and
+      bAdt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAdt(e, i, _)) | i) and
+      bItem = bAdt + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfAdt(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        result = getImmediateChildOfItem(e, index - bAdt, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfAsyncBlockExpr(
-    AsyncBlockExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bBlockExprBase, int n |
+  private Element getImmediateChildOfTrait(Trait e, int index, string partialPredicateCall) {
+    exists(int b, int bItem, int n |
       b = 0 and
-      bBlockExprBase =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfBlockExprBase(e, i, _)) | i) and
-      n = bBlockExprBase and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfBlockExprBase(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfBlockExpr(BlockExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bBlockExprBase, int n, int nLabel |
+  private Element getImmediateChildOfTraitAlias(TraitAlias e, int index, string partialPredicateCall) {
+    exists(int b, int bItem, int n |
       b = 0 and
-      bBlockExprBase =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfBlockExprBase(e, i, _)) | i) and
-      n = bBlockExprBase and
-      nLabel = n + 1 and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfBlockExprBase(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getLabel() and partialPredicateCall = "Label()"
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfElementListExpr(
-    ElementListExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bArrayExpr, int n, int nElement |
+  private Element getImmediateChildOfTypeAlias(TypeAlias e, int index, string partialPredicateCall) {
+    exists(int b, int bAssocItem, int bExternItem, int bItem, int n |
       b = 0 and
-      bArrayExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfArrayExpr(e, i, _)) | i) and
-      n = bArrayExpr and
-      nElement = n + 1 + max(int i | i = -1 or exists(e.getElement(i)) | i) and
+      bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
+      bExternItem =
+        bAssocItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfExternItem(e, i, _)) | i) and
+      bItem = bExternItem + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfArrayExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfAssocItem(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfExternItem(e, index - bAssocItem, partialPredicateCall)
         or
-        result = e.getElement(index - n) and
-        partialPredicateCall = "Element(" + (index - n).toString() + ")"
+        result = getImmediateChildOfItem(e, index - bExternItem, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfRepeatExpr(RepeatExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bArrayExpr, int n, int nInitializer, int nRepeat |
+  private Element getImmediateChildOfUnion(Union e, int index, string partialPredicateCall) {
+    exists(int b, int bAdt, int bItem, int n |
       b = 0 and
-      bArrayExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfArrayExpr(e, i, _)) | i) and
-      n = bArrayExpr and
-      nInitializer = n + 1 and
-      nRepeat = nInitializer + 1 and
+      bAdt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAdt(e, i, _)) | i) and
+      bItem = bAdt + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfArrayExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfAdt(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getInitializer() and partialPredicateCall = "Initializer()"
-        or
-        index = nInitializer and result = e.getRepeat() and partialPredicateCall = "Repeat()"
+        result = getImmediateChildOfItem(e, index - bAdt, partialPredicateCall)
       )
     )
   }
 
-  private Element getImmediateChildOfUnsafeBlockExpr(
-    UnsafeBlockExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bBlockExprBase, int n |
+  private Element getImmediateChildOfUse(Use e, int index, string partialPredicateCall) {
+    exists(int b, int bItem, int n |
       b = 0 and
-      bBlockExprBase =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfBlockExprBase(e, i, _)) | i) and
-      n = bBlockExprBase and
+      bItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfItem(e, i, _)) | i) and
+      n = bItem and
       (
         none()
         or
-        result = getImmediateChildOfBlockExprBase(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfItem(e, index - b, partialPredicateCall)
       )
     )
   }
@@ -1310,29 +2181,119 @@ private module Impl {
     // * none() simplifies generation, as we can append `or ...` without a special case for the first item
     none()
     or
+    result = getImmediateChildOfMissing(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfUnimplemented(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfAbi(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfArgList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfAssocItemList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfAttr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfClosureBinder(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfExternItemList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfFormatArgsArg(e, index, partialAccessor)
+    or
     result = getImmediateChildOfGenericArgList(e, index, partialAccessor)
     or
+    result = getImmediateChildOfGenericParamList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfItemList(e, index, partialAccessor)
+    or
     result = getImmediateChildOfLabel(e, index, partialAccessor)
     or
+    result = getImmediateChildOfLetElse(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfLifetime(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroItems(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroStmts(e, index, partialAccessor)
+    or
     result = getImmediateChildOfMatchArm(e, index, partialAccessor)
     or
+    result = getImmediateChildOfMatchArmList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMatchGuard(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMeta(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfName(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfNameRef(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfParam(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfParamList(e, index, partialAccessor)
+    or
     result = getImmediateChildOfPath(e, index, partialAccessor)
     or
+    result = getImmediateChildOfPathSegment(e, index, partialAccessor)
+    or
     result = getImmediateChildOfRecordExprField(e, index, partialAccessor)
     or
+    result = getImmediateChildOfRecordExprFieldList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfRecordField(e, index, partialAccessor)
+    or
     result = getImmediateChildOfRecordPatField(e, index, partialAccessor)
     or
-    result = getImmediateChildOfTypeRef(e, index, partialAccessor)
+    result = getImmediateChildOfRecordPatFieldList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfRename(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfRetType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfReturnTypeSyntax(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfSelfParam(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfSourceFile(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfStmtList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTokenTree(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTupleField(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTypeBound(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTypeBoundList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfUseTree(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfUseTreeList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfVariant(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfVariantList(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfVisibility(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfWhereClause(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfWherePred(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfArrayExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfArrayType(e, index, partialAccessor)
     or
     result = getImmediateChildOfAsmExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfAssocTypeArg(e, index, partialAccessor)
+    or
     result = getImmediateChildOfAwaitExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfBecomeExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfBinaryExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfBoxExpr(e, index, partialAccessor)
+    result = getImmediateChildOfBlockExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfBoxPat(e, index, partialAccessor)
     or
@@ -1344,81 +2305,127 @@ private module Impl {
     or
     result = getImmediateChildOfClosureExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfConstArg(e, index, partialAccessor)
+    or
     result = getImmediateChildOfConstBlockPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfConstExpr(e, index, partialAccessor)
+    result = getImmediateChildOfConstParam(e, index, partialAccessor)
     or
     result = getImmediateChildOfContinueExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfDynTraitType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfExprStmt(e, index, partialAccessor)
     or
     result = getImmediateChildOfFieldExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfFunction(e, index, partialAccessor)
+    result = getImmediateChildOfFnPtrType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfForExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfForType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfFormatArgsExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfIdentPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfIfExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfImplTraitType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfIndexExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfItemStmt(e, index, partialAccessor)
+    result = getImmediateChildOfInferType(e, index, partialAccessor)
     or
     result = getImmediateChildOfLetExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfLetStmt(e, index, partialAccessor)
     or
-    result = getImmediateChildOfLiteralExpr(e, index, partialAccessor)
+    result = getImmediateChildOfLifetimeArg(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfLifetimeParam(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfLiteral(e, index, partialAccessor)
     or
     result = getImmediateChildOfLiteralPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfLoopExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfMatchExpr(e, index, partialAccessor)
+    result = getImmediateChildOfMacroExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfMethodCallExpr(e, index, partialAccessor)
+    result = getImmediateChildOfMacroPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfMissingExpr(e, index, partialAccessor)
+    result = getImmediateChildOfMacroType(e, index, partialAccessor)
     or
-    result = getImmediateChildOfMissingPat(e, index, partialAccessor)
+    result = getImmediateChildOfMatchExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfModule(e, index, partialAccessor)
+    result = getImmediateChildOfMethodCallExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfNeverType(e, index, partialAccessor)
     or
     result = getImmediateChildOfOffsetOfExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfOrPat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfParenExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfParenPat(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfParenType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfPathExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfPathPat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfPathType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfPrefixExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfPtrType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfRangeExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfRangePat(e, index, partialAccessor)
     or
     result = getImmediateChildOfRecordExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfRecordFieldList(e, index, partialAccessor)
+    or
     result = getImmediateChildOfRecordPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfRefExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfRefPat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfRefType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfRestPat(e, index, partialAccessor)
+    or
     result = getImmediateChildOfReturnExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfSlicePat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfSliceType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTryExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTupleExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfTupleFieldList(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTuplePat(e, index, partialAccessor)
     or
     result = getImmediateChildOfTupleStructPat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfTupleType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTypeArg(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTypeParam(e, index, partialAccessor)
+    or
     result = getImmediateChildOfUnderscoreExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfUnimplementedDeclaration(e, index, partialAccessor)
+    result = getImmediateChildOfWhileExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfWildcardPat(e, index, partialAccessor)
     or
@@ -1426,15 +2433,39 @@ private module Impl {
     or
     result = getImmediateChildOfYieldExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfAsyncBlockExpr(e, index, partialAccessor)
+    result = getImmediateChildOfConst(e, index, partialAccessor)
     or
-    result = getImmediateChildOfBlockExpr(e, index, partialAccessor)
+    result = getImmediateChildOfEnum(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfExternBlock(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfExternCrate(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfFn(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfImpl(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroCall(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroDef(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfMacroRules(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfModule(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfStatic(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfStruct(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTrait(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfTraitAlias(e, index, partialAccessor)
     or
-    result = getImmediateChildOfElementListExpr(e, index, partialAccessor)
+    result = getImmediateChildOfTypeAlias(e, index, partialAccessor)
     or
-    result = getImmediateChildOfRepeatExpr(e, index, partialAccessor)
+    result = getImmediateChildOfUnion(e, index, partialAccessor)
     or
-    result = getImmediateChildOfUnsafeBlockExpr(e, index, partialAccessor)
+    result = getImmediateChildOfUse(e, index, partialAccessor)
   }
 }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Pat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Pat.qll
index e0725bd0212b5..5ffda711d9a0b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Pat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Pat.qll
@@ -14,7 +14,6 @@ import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
  */
 module Generated {
   /**
-   * The base class for patterns.
    * INTERNAL: Do not reference the `Generated::Pat` class directly.
    * Use the subclass `Pat`, where the following predicates are available.
    */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll
index f61f3b48ffd43..0dbe027c1d4cd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll
@@ -7,7 +7,8 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.internal.UnimplementedImpl::Impl as UnimplementedImpl
+import codeql.rust.elements.Path
+import codeql.rust.elements.PathSegment
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Path` and should not
@@ -15,14 +16,34 @@ import codeql.rust.elements.internal.UnimplementedImpl::Impl as UnimplementedImp
  */
 module Generated {
   /**
-   * A path. For example:
-   * ```
-   * foo::bar;
-   * ```
    * INTERNAL: Do not reference the `Generated::Path` class directly.
    * Use the subclass `Path`, where the following predicates are available.
    */
-  class Path extends Synth::TPath, AstNodeImpl::AstNode, UnimplementedImpl::Unimplemented {
+  class Path extends Synth::TPath, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "Path" }
+
+    /**
+     * Gets the qualifier of this path, if it exists.
+     */
+    Path getQualifier() {
+      result = Synth::convertPathFromRaw(Synth::convertPathToRaw(this).(Raw::Path).getQualifier())
+    }
+
+    /**
+     * Holds if `getQualifier()` exists.
+     */
+    final predicate hasQualifier() { exists(this.getQualifier()) }
+
+    /**
+     * Gets the part of this path, if it exists.
+     */
+    PathSegment getPart() {
+      result = Synth::convertPathSegmentFromRaw(Synth::convertPathToRaw(this).(Raw::Path).getPart())
+    }
+
+    /**
+     * Holds if `getPart()` exists.
+     */
+    final predicate hasPart() { exists(this.getPart()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
index 4b759d48756ea..5363ff3e06b16 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
@@ -6,6 +6,7 @@
 
 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.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Path
 
@@ -15,13 +16,6 @@ import codeql.rust.elements.Path
  */
 module Generated {
   /**
-   * A path expression. For example:
-   * ```
-   * let x = variable;
-   * let x = foo::bar;
-   * let y = <T>::foo;
-   * let z = <TypeRef as Trait>::foo;
-   * ```
    * INTERNAL: Do not reference the `Generated::PathExpr` class directly.
    * Use the subclass `PathExpr`, where the following predicates are available.
    */
@@ -29,11 +23,34 @@ module Generated {
     override string getAPrimaryQlClass() { result = "PathExpr" }
 
     /**
-     * Gets the path of this path expression.
+     * Gets the `index`th attr of this path expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertPathExprToRaw(this).(Raw::PathExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this path expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this path expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the path of this path expression, if it exists.
      */
     Path getPath() {
       result =
         Synth::convertPathFromRaw(Synth::convertPathExprToRaw(this).(Raw::PathExpr).getPath())
     }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
index b3ae084cada1e..cf988588cc6f5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
@@ -15,13 +15,6 @@ import codeql.rust.elements.Path
  */
 module Generated {
   /**
-   * A path pattern. For example:
-   * ```
-   * match x {
-   *     Foo::Bar => "ok",
-   *     _ => "fail",
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::PathPat` class directly.
    * Use the subclass `PathPat`, where the following predicates are available.
    */
@@ -29,10 +22,15 @@ module Generated {
     override string getAPrimaryQlClass() { result = "PathPat" }
 
     /**
-     * Gets the path of this path pat.
+     * Gets the path of this path pat, if it exists.
      */
     Path getPath() {
       result = Synth::convertPathFromRaw(Synth::convertPathPatToRaw(this).(Raw::PathPat).getPath())
     }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
new file mode 100644
index 0000000000000..b81725a95c3c0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
@@ -0,0 +1,133 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PathSegment`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.NameRef
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.PathType
+import codeql.rust.elements.RetType
+import codeql.rust.elements.ReturnTypeSyntax
+import codeql.rust.elements.Type
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PathSegment` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::PathSegment` class directly.
+   * Use the subclass `PathSegment`, where the following predicates are available.
+   */
+  class PathSegment extends Synth::TPathSegment, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "PathSegment" }
+
+    /**
+     * Gets the generic argument list of this path segment, if it exists.
+     */
+    GenericArgList getGenericArgList() {
+      result =
+        Synth::convertGenericArgListFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getGenericArgList())
+    }
+
+    /**
+     * Holds if `getGenericArgList()` exists.
+     */
+    final predicate hasGenericArgList() { exists(this.getGenericArgList()) }
+
+    /**
+     * Gets the name reference of this path segment, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
+
+    /**
+     * Gets the parameter list of this path segment, if it exists.
+     */
+    ParamList getParamList() {
+      result =
+        Synth::convertParamListFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getParamList())
+    }
+
+    /**
+     * Holds if `getParamList()` exists.
+     */
+    final predicate hasParamList() { exists(this.getParamList()) }
+
+    /**
+     * Gets the path type of this path segment, if it exists.
+     */
+    PathType getPathType() {
+      result =
+        Synth::convertPathTypeFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getPathType())
+    }
+
+    /**
+     * Holds if `getPathType()` exists.
+     */
+    final predicate hasPathType() { exists(this.getPathType()) }
+
+    /**
+     * Gets the ret type of this path segment, if it exists.
+     */
+    RetType getRetType() {
+      result =
+        Synth::convertRetTypeFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getRetType())
+    }
+
+    /**
+     * Holds if `getRetType()` exists.
+     */
+    final predicate hasRetType() { exists(this.getRetType()) }
+
+    /**
+     * Gets the return type syntax of this path segment, if it exists.
+     */
+    ReturnTypeSyntax getReturnTypeSyntax() {
+      result =
+        Synth::convertReturnTypeSyntaxFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getReturnTypeSyntax())
+    }
+
+    /**
+     * Holds if `getReturnTypeSyntax()` exists.
+     */
+    final predicate hasReturnTypeSyntax() { exists(this.getReturnTypeSyntax()) }
+
+    /**
+     * Gets the ty of this path segment, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertPathSegmentToRaw(this).(Raw::PathSegment).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll
new file mode 100644
index 0000000000000..d5c84375e891f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll
@@ -0,0 +1,37 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PathType`.
+ * 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.Path
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PathType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::PathType` class directly.
+   * Use the subclass `PathType`, where the following predicates are available.
+   */
+  class PathType extends Synth::TPathType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "PathType" }
+
+    /**
+     * Gets the path of this path type, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertPathTypeToRaw(this).(Raw::PathType).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll
index 790d93b681e4f..3373dc57cf985 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PrefixExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,12 +16,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * A unary operation expression. For example:
-   * ```
-   * let x = -42
-   * let y = !true
-   * let z = *ptr
-   * ```
    * INTERNAL: Do not reference the `Generated::PrefixExpr` class directly.
    * Use the subclass `PrefixExpr`, where the following predicates are available.
    */
@@ -28,7 +23,27 @@ module Generated {
     override string getAPrimaryQlClass() { result = "PrefixExpr" }
 
     /**
-     * Gets the expression of this prefix expression.
+     * Gets the `index`th attr of this prefix expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertPrefixExprToRaw(this)
+              .(Raw::PrefixExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this prefix expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this prefix expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this prefix expression, if it exists.
      */
     Expr getExpr() {
       result =
@@ -36,8 +51,8 @@ module Generated {
     }
 
     /**
-     * Gets the op of this prefix expression.
+     * Holds if `getExpr()` exists.
      */
-    string getOp() { result = Synth::convertPrefixExprToRaw(this).(Raw::PrefixExpr).getOp() }
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll
new file mode 100644
index 0000000000000..11b7cb264adb9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll
@@ -0,0 +1,36 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PtrType`.
+ * 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.Type
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PtrType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::PtrType` class directly.
+   * Use the subclass `PtrType`, where the following predicates are available.
+   */
+  class PtrType extends Synth::TPtrType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "PtrType" }
+
+    /**
+     * Gets the ty of this ptr type, if it exists.
+     */
+    Type getTy() {
+      result = Synth::convertTypeFromRaw(Synth::convertPtrTypeToRaw(this).(Raw::PtrType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll
index b09e8fc90eddf..f966fdfd057eb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RangeExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,15 +16,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * A range expression. For example:
-   * ```
-   * let x = 1..=10;
-   * let x = 1..10;
-   * let x = 10..;
-   * let x = ..10;
-   * let x = ..=10;
-   * let x = ..;
-   * ```
    * INTERNAL: Do not reference the `Generated::RangeExpr` class directly.
    * Use the subclass `RangeExpr`, where the following predicates are available.
    */
@@ -31,34 +23,47 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RangeExpr" }
 
     /**
-     * Gets the lhs of this range expression, if it exists.
+     * Gets the `index`th attr of this range expression (0-based).
      */
-    Expr getLhs() {
+    Attr getAttr(int index) {
       result =
-        Synth::convertExprFromRaw(Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getLhs())
+        Synth::convertAttrFromRaw(Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getAttr(index))
     }
 
     /**
-     * Holds if `getLhs()` exists.
+     * Gets any of the attrs of this range expression.
      */
-    final predicate hasLhs() { exists(this.getLhs()) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the rhs of this range expression, if it exists.
+     * Gets the number of attrs of this range expression.
      */
-    Expr getRhs() {
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the end of this range expression, if it exists.
+     */
+    Expr getEnd() {
       result =
-        Synth::convertExprFromRaw(Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getRhs())
+        Synth::convertExprFromRaw(Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getEnd())
     }
 
     /**
-     * Holds if `getRhs()` exists.
+     * Holds if `getEnd()` exists.
+     */
+    final predicate hasEnd() { exists(this.getEnd()) }
+
+    /**
+     * Gets the start of this range expression, if it exists.
      */
-    final predicate hasRhs() { exists(this.getRhs()) }
+    Expr getStart() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).getStart())
+    }
 
     /**
-     * Holds if this range expression is inclusive.
+     * Holds if `getStart()` exists.
      */
-    predicate isInclusive() { Synth::convertRangeExprToRaw(this).(Raw::RangeExpr).isInclusive() }
+    final predicate hasStart() { exists(this.getStart()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
index b23da3c7a631a..963dc44ae1cf4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
@@ -15,14 +15,6 @@ import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
  */
 module Generated {
   /**
-   * A range pattern. For example:
-   * ```
-   * match x {
-   *     ..15 => "too cold",
-   *     16..=25 => "just right",
-   *     26.. => "too hot",
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::RangePat` class directly.
    * Use the subclass `RangePat`, where the following predicates are available.
    */
@@ -30,28 +22,28 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RangePat" }
 
     /**
-     * Gets the start of this range pat, if it exists.
+     * Gets the end of this range pat, if it exists.
      */
-    Pat getStart() {
-      result =
-        Synth::convertPatFromRaw(Synth::convertRangePatToRaw(this).(Raw::RangePat).getStart())
+    Pat getEnd() {
+      result = Synth::convertPatFromRaw(Synth::convertRangePatToRaw(this).(Raw::RangePat).getEnd())
     }
 
     /**
-     * Holds if `getStart()` exists.
+     * Holds if `getEnd()` exists.
      */
-    final predicate hasStart() { exists(this.getStart()) }
+    final predicate hasEnd() { exists(this.getEnd()) }
 
     /**
-     * Gets the end of this range pat, if it exists.
+     * Gets the start of this range pat, if it exists.
      */
-    Pat getEnd() {
-      result = Synth::convertPatFromRaw(Synth::convertRangePatToRaw(this).(Raw::RangePat).getEnd())
+    Pat getStart() {
+      result =
+        Synth::convertPatFromRaw(Synth::convertRangePatToRaw(this).(Raw::RangePat).getStart())
     }
 
     /**
-     * Holds if `getEnd()` exists.
+     * Holds if `getStart()` exists.
      */
-    final predicate hasEnd() { exists(this.getEnd()) }
+    final predicate hasStart() { exists(this.getStart()) }
   }
 }
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 ec16a9d404422..970d9f532e0d5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -33,1490 +33,2776 @@ module Raw {
    * INTERNAL: Do not use.
    * The base class marking errors during parsing or resolution.
    */
-  class Missing extends @missing, Unextracted { }
+  class Missing extends @missing, Unextracted {
+    override string toString() { result = "Missing" }
+  }
 
   /**
    * INTERNAL: Do not use.
    * The base class for unimplemented nodes. This is used to mark nodes that are not yet extracted.
    */
-  class Unimplemented extends @unimplemented, Unextracted { }
+  class Unimplemented extends @unimplemented, Unextracted {
+    override string toString() { result = "Unimplemented" }
+  }
 
   /**
    * INTERNAL: Do not use.
-   * The base class for declarations.
    */
-  class Declaration extends @declaration, AstNode { }
+  class Abi extends @abi, AstNode {
+    override string toString() { result = "Abi" }
+  }
 
   /**
    * INTERNAL: Do not use.
-   * The base class for expressions.
    */
-  class Expr extends @expr, AstNode { }
+  class Adt extends @adt, AstNode { }
 
   /**
    * INTERNAL: Do not use.
-   * The base class for generic arguments.
-   * ```
-   * x.foo::<u32, u64>(42);
-   * ```
    */
-  class GenericArgList extends @generic_arg_list, AstNode, Unimplemented {
-    override string toString() { result = "GenericArgList" }
+  class ArgList extends @arg_list, AstNode {
+    override string toString() { result = "ArgList" }
+
+    /**
+     * Gets the `index`th argument of this argument list (0-based).
+     */
+    Expr getArg(int index) { arg_list_args(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A label. For example:
-   * ```
-   * 'label: loop {
-   *     println!("Hello, world (once)!");
-   *     break 'label;
-   * };
-   * ```
    */
-  class Label extends @label, AstNode {
-    override string toString() { result = "Label" }
+  class AssocItem extends @assoc_item, AstNode { }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class AssocItemList extends @assoc_item_list, AstNode {
+    override string toString() { result = "AssocItemList" }
+
+    /**
+     * Gets the `index`th assoc item of this assoc item list (0-based).
+     */
+    AssocItem getAssocItem(int index) { assoc_item_list_assoc_items(this, index, result) }
 
     /**
-     * Gets the name of this label.
+     * Gets the `index`th attr of this assoc item list (0-based).
      */
-    string getName() { labels(this, result) }
+    Attr getAttr(int index) { assoc_item_list_attrs(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A match arm. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) => y,
-   *     Option::None => 0,
-   * };
-   * ```
-   * ```
-   * match x {
-   *     Some(y) if y != 0 => 1 / y,
-   *     _ => 0,
-   * };
-   * ```
    */
-  class MatchArm extends @match_arm, AstNode {
-    override string toString() { result = "MatchArm" }
+  class Attr extends @attr, AstNode {
+    override string toString() { result = "Attr" }
 
     /**
-     * Gets the pat of this match arm.
+     * Gets the meta of this attr, if it exists.
      */
-    Pat getPat() { match_arms(this, result, _) }
+    Meta getMeta() { attr_meta(this, result) }
+  }
 
-    /**
-     * Gets the guard of this match arm, if it exists.
-     */
-    Expr getGuard() { match_arm_guards(this, result) }
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ClosureBinder extends @closure_binder, AstNode {
+    override string toString() { result = "ClosureBinder" }
 
     /**
-     * Gets the expression of this match arm.
+     * Gets the generic parameter list of this closure binder, if it exists.
      */
-    Expr getExpr() { match_arms(this, _, result) }
+    GenericParamList getGenericParamList() { closure_binder_generic_param_lists(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * The base class for patterns.
    */
-  class Pat extends @pat, AstNode { }
+  class Expr extends @expr, AstNode { }
 
   /**
    * INTERNAL: Do not use.
-   * A path. For example:
-   * ```
-   * foo::bar;
-   * ```
    */
-  class Path extends @path, AstNode, Unimplemented {
-    override string toString() { result = "Path" }
-  }
+  class ExternItem extends @extern_item, AstNode { }
 
   /**
    * INTERNAL: Do not use.
-   * A field in a record expression. For example `a: 1` in:
-   * ```
-   * Foo { a: 1, b: 2 };
-   * ```
    */
-  class RecordExprField extends @record_expr_field, AstNode {
-    override string toString() { result = "RecordExprField" }
+  class ExternItemList extends @extern_item_list, AstNode {
+    override string toString() { result = "ExternItemList" }
 
     /**
-     * Gets the name of this record expression field.
+     * Gets the `index`th attr of this extern item list (0-based).
      */
-    string getName() { record_expr_fields(this, result, _) }
+    Attr getAttr(int index) { extern_item_list_attrs(this, index, result) }
 
     /**
-     * Gets the expression of this record expression field.
+     * Gets the `index`th extern item of this extern item list (0-based).
      */
-    Expr getExpr() { record_expr_fields(this, _, result) }
+    ExternItem getExternItem(int index) { extern_item_list_extern_items(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A field in a record pattern. For example `a: 1` in:
-   * ```
-   * let Foo { a: 1, b: 2 } = foo;
-   * ```
    */
-  class RecordPatField extends @record_pat_field, AstNode {
-    override string toString() { result = "RecordPatField" }
+  class FieldList extends @field_list, AstNode { }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class FormatArgsArg extends @format_args_arg, AstNode {
+    override string toString() { result = "FormatArgsArg" }
 
     /**
-     * Gets the name of this record pat field.
+     * Gets the expression of this format arguments argument, if it exists.
      */
-    string getName() { record_pat_fields(this, result, _) }
+    Expr getExpr() { format_args_arg_exprs(this, result) }
 
     /**
-     * Gets the pat of this record pat field.
+     * Gets the name of this format arguments argument, if it exists.
      */
-    Pat getPat() { record_pat_fields(this, _, result) }
+    Name getName() { format_args_arg_names(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * The base class for statements.
    */
-  class Stmt extends @stmt, AstNode { }
+  class GenericArg extends @generic_arg, AstNode { }
 
   /**
    * INTERNAL: Do not use.
-   * The base class for type references.
-   * ```
-   * let x: i32;
-   * let y: Vec<i32>;
-   * let z: Option<i32>;
-   * ```
    */
-  class TypeRef extends @type_ref, AstNode, Unimplemented {
-    override string toString() { result = "TypeRef" }
+  class GenericArgList extends @generic_arg_list, AstNode {
+    override string toString() { result = "GenericArgList" }
+
+    /**
+     * Gets the `index`th generic argument of this generic argument list (0-based).
+     */
+    GenericArg getGenericArg(int index) { generic_arg_list_generic_args(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An array expression. For example:
-   * ```
-   * [1, 2, 3];
-   * [1; 10];
-   * ```
    */
-  class ArrayExpr extends @array_expr, Expr { }
+  class GenericParam extends @generic_param, AstNode { }
 
   /**
    * INTERNAL: Do not use.
-   * An inline assembly expression. For example:
-   * ```
-   * unsafe {
-   *     builtin # asm(_);
-   * }
-   * ```
    */
-  class AsmExpr extends @asm_expr, Expr {
-    override string toString() { result = "AsmExpr" }
+  class GenericParamList extends @generic_param_list, AstNode {
+    override string toString() { result = "GenericParamList" }
 
     /**
-     * Gets the expression of this asm expression.
+     * Gets the `index`th generic parameter of this generic parameter list (0-based).
      */
-    Expr getExpr() { asm_exprs(this, result) }
+    GenericParam getGenericParam(int index) {
+      generic_param_list_generic_params(this, index, result)
+    }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An `await` expression. For example:
-   * ```
-   * async {
-   *     let x = foo().await;
-   *     x
-   * }
-   * ```
    */
-  class AwaitExpr extends @await_expr, Expr {
-    override string toString() { result = "AwaitExpr" }
+  class ItemList extends @item_list, AstNode {
+    override string toString() { result = "ItemList" }
 
     /**
-     * Gets the expression of this await expression.
+     * Gets the `index`th attr of this item list (0-based).
      */
-    Expr getExpr() { await_exprs(this, result) }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A `become` expression. For example:
-   * ```
-   * fn fact_a(n: i32, a: i32) -> i32 {
-   *      if n == 0 {
-   *          a
-   *      } else {
-   *          become fact_a(n - 1, n * a)
-   *      }
-   *  }    ```
-   */
-  class BecomeExpr extends @become_expr, Expr {
-    override string toString() { result = "BecomeExpr" }
+    Attr getAttr(int index) { item_list_attrs(this, index, result) }
 
     /**
-     * Gets the expression of this become expression.
+     * Gets the `index`th item of this item list (0-based).
      */
-    Expr getExpr() { become_exprs(this, result) }
+    Item getItem(int index) { item_list_items(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A binary operation expression. For example:
-   * ```
-   * x + y;
-   * x && y;
-   * x <= y;
-   * x = y;
-   * x += y;
-   * ```
    */
-  class BinaryExpr extends @binary_expr, Expr {
-    override string toString() { result = "BinaryExpr" }
-
-    /**
-     * Gets the lhs of this binary expression.
-     */
-    Expr getLhs() { binary_exprs(this, result, _) }
-
-    /**
-     * Gets the rhs of this binary expression.
-     */
-    Expr getRhs() { binary_exprs(this, _, result) }
+  class Label extends @label, AstNode {
+    override string toString() { result = "Label" }
 
     /**
-     * Gets the op of this binary expression, if it exists.
+     * Gets the lifetime of this label, if it exists.
      */
-    string getOp() { binary_expr_ops(this, result) }
+    Lifetime getLifetime() { label_lifetimes(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
    */
-  class BlockExprBase extends @block_expr_base, Expr {
-    /**
-     * Gets the `index`th statement of this block expression base (0-based).
-     */
-    Stmt getStatement(int index) { block_expr_base_statements(this, index, result) }
+  class LetElse extends @let_else, AstNode {
+    override string toString() { result = "LetElse" }
 
     /**
-     * Gets the tail of this block expression base, if it exists.
+     * Gets the block expression of this let else, if it exists.
      */
-    Expr getTail() { block_expr_base_tails(this, result) }
+    BlockExpr getBlockExpr() { let_else_block_exprs(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A box expression. For example:
-   * ```
-   * let x = #[rustc_box] Box::new(42);
-   * ```
    */
-  class BoxExpr extends @box_expr, Expr {
-    override string toString() { result = "BoxExpr" }
-
-    /**
-     * Gets the expression of this box expression.
-     */
-    Expr getExpr() { box_exprs(this, result) }
+  class Lifetime extends @lifetime, AstNode {
+    override string toString() { result = "Lifetime" }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A box pattern. For example:
-   * ```
-   * match x {
-   *     box Option::Some(y) => y,
-   *     box Option::None => 0,
-   * };
-   * ```
    */
-  class BoxPat extends @box_pat, Pat {
-    override string toString() { result = "BoxPat" }
+  class MacroItems extends @macro_items, AstNode {
+    override string toString() { result = "MacroItems" }
 
     /**
-     * Gets the inner of this box pat.
+     * Gets the `index`th item of this macro items (0-based).
      */
-    Pat getInner() { box_pats(this, result) }
+    Item getItem(int index) { macro_items_items(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A break expression. For example:
-   * ```
-   * loop {
-   *     if not_ready() {
-   *         break;
-   *      }
-   * }
-   * ```
-   * ```
-   * let x = 'label: loop {
-   *     if done() {
-   *         break 'label 42;
-   *     }
-   * };
-   * ```
    */
-  class BreakExpr extends @break_expr, Expr {
-    override string toString() { result = "BreakExpr" }
+  class MacroStmts extends @macro_stmts, AstNode {
+    override string toString() { result = "MacroStmts" }
 
     /**
-     * Gets the expression of this break expression, if it exists.
+     * Gets the expression of this macro statements, if it exists.
      */
-    Expr getExpr() { break_expr_exprs(this, result) }
+    Expr getExpr() { macro_stmts_exprs(this, result) }
 
     /**
-     * Gets the label of this break expression, if it exists.
+     * Gets the `index`th statement of this macro statements (0-based).
      */
-    Label getLabel() { break_expr_labels(this, result) }
+    Stmt getStatement(int index) { macro_stmts_statements(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A function call expression. For example:
-   * ```
-   * foo(42);
-   * foo::<u32, u64>(42);
-   * foo[0](42);
-   * foo(1) = 4;
-   * ```
    */
-  class CallExpr extends @call_expr, Expr {
-    override string toString() { result = "CallExpr" }
+  class MatchArm extends @match_arm, AstNode {
+    override string toString() { result = "MatchArm" }
+
+    /**
+     * Gets the `index`th attr of this match arm (0-based).
+     */
+    Attr getAttr(int index) { match_arm_attrs(this, index, result) }
 
     /**
-     * Gets the callee of this call expression.
+     * Gets the expression of this match arm, if it exists.
      */
-    Expr getCallee() { call_exprs(this, result) }
+    Expr getExpr() { match_arm_exprs(this, result) }
 
     /**
-     * Gets the `index`th argument of this call expression (0-based).
+     * Gets the guard of this match arm, if it exists.
      */
-    Expr getArg(int index) { call_expr_args(this, index, result) }
+    MatchGuard getGuard() { match_arm_guards(this, result) }
 
     /**
-     * Holds if this call expression is assignee expression.
+     * Gets the pat of this match arm, if it exists.
      */
-    predicate isAssigneeExpr() { call_expr_is_assignee_expr(this) }
+    Pat getPat() { match_arm_pats(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A cast expression. For example:
-   * ```
-   * value as u64;
-   * ```
    */
-  class CastExpr extends @cast_expr, Expr {
-    override string toString() { result = "CastExpr" }
+  class MatchArmList extends @match_arm_list, AstNode {
+    override string toString() { result = "MatchArmList" }
 
     /**
-     * Gets the expression of this cast expression.
+     * Gets the `index`th arm of this match arm list (0-based).
      */
-    Expr getExpr() { cast_exprs(this, result, _) }
+    MatchArm getArm(int index) { match_arm_list_arms(this, index, result) }
 
     /**
-     * Gets the type of this cast expression.
+     * Gets the `index`th attr of this match arm list (0-based).
      */
-    TypeRef getType() { cast_exprs(this, _, result) }
+    Attr getAttr(int index) { match_arm_list_attrs(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A closure expression. For example:
-   * ```
-   * |x| x + 1;
-   * move |x: i32| -> i32 { x + 1 };
-   * async |x: i32, y| x + y;
-   *  #[coroutine]
-   * |x| yield x;
-   *  #[coroutine]
-   *  static |x| yield x;
-   * ```
    */
-  class ClosureExpr extends @closure_expr, Expr {
-    override string toString() { result = "ClosureExpr" }
-
-    /**
-     * Gets the `index`th argument of this closure expression (0-based).
-     */
-    Pat getArg(int index) { closure_expr_args(this, index, result) }
+  class MatchGuard extends @match_guard, AstNode {
+    override string toString() { result = "MatchGuard" }
 
     /**
-     * Gets the `index`th argument type of this closure expression (0-based), if it exists.
+     * Gets the condition of this match guard, if it exists.
      */
-    TypeRef getArgType(int index) { closure_expr_arg_types(this, index, result) }
+    Expr getCondition() { match_guard_conditions(this, result) }
+  }
 
-    /**
-     * Gets the ret type of this closure expression, if it exists.
-     */
-    TypeRef getRetType() { closure_expr_ret_types(this, result) }
+  /**
+   * INTERNAL: Do not use.
+   */
+  class Meta extends @meta, AstNode {
+    override string toString() { result = "Meta" }
 
     /**
-     * Gets the body of this closure expression.
+     * Gets the expression of this meta, if it exists.
      */
-    Expr getBody() { closure_exprs(this, result, _) }
+    Expr getExpr() { meta_exprs(this, result) }
 
     /**
-     * Gets the closure kind of this closure expression.
+     * Gets the path of this meta, if it exists.
      */
-    string getClosureKind() { closure_exprs(this, _, result) }
+    Path getPath() { meta_paths(this, result) }
 
     /**
-     * Holds if this closure expression is move.
+     * Gets the token tree of this meta, if it exists.
      */
-    predicate isMove() { closure_expr_is_move(this) }
+    TokenTree getTokenTree() { meta_token_trees(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A const block pattern. For example:
-   * ```
-   * match x {
-   *     const { 1 + 2 + 3 } => "ok",
-   *     _ => "fail",
-   * };
-   * ```
    */
-  class ConstBlockPat extends @const_block_pat, Pat {
-    override string toString() { result = "ConstBlockPat" }
-
-    /**
-     * Gets the expression of this const block pat.
-     */
-    Expr getExpr() { const_block_pats(this, result) }
+  class Name extends @name, AstNode {
+    override string toString() { result = "Name" }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A `const` block expression. For example:
-   * ```
-   * if const { SRC::IS_ZST || DEST::IS_ZST || mem::align_of::<SRC>() != mem::align_of::<DEST>() } {
-   *     return false;
-   * }
-   * ```
    */
-  class ConstExpr extends @const_expr, Expr {
-    override string toString() { result = "ConstExpr" }
-
-    /**
-     * Gets the expression of this const expression.
-     */
-    Expr getExpr() { const_exprs(this, result) }
+  class NameRef extends @name_ref, AstNode {
+    override string toString() { result = "NameRef" }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A continue expression. For example:
-   * ```
-   * loop {
-   *     if not_ready() {
-   *         continue;
-   *     }
-   * }
-   * ```
-   * ```
-   * 'label: loop {
-   *     if not_ready() {
-   *         continue 'label;
-   *     }
-   * }
-   * ```
    */
-  class ContinueExpr extends @continue_expr, Expr {
-    override string toString() { result = "ContinueExpr" }
+  class Param extends @param, AstNode {
+    override string toString() { result = "Param" }
 
     /**
-     * Gets the label of this continue expression, if it exists.
+     * Gets the `index`th attr of this parameter (0-based).
      */
-    Label getLabel() { continue_expr_labels(this, result) }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * An expression statement. For example:
-   * ```
-   * start();
-   * finish()
-   * use std::env;
-   * ```
-   */
-  class ExprStmt extends @expr_stmt, Stmt {
-    override string toString() { result = "ExprStmt" }
+    Attr getAttr(int index) { param_attrs(this, index, result) }
 
     /**
-     * Gets the expression of this expression statement.
+     * Gets the pat of this parameter, if it exists.
      */
-    Expr getExpr() { expr_stmts(this, result) }
+    Pat getPat() { param_pats(this, result) }
 
     /**
-     * Holds if this expression statement has semicolon.
+     * Gets the ty of this parameter, if it exists.
      */
-    predicate hasSemicolon() { expr_stmt_has_semicolon(this) }
+    Type getTy() { param_ties(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A field access expression. For example:
-   * ```
-   * x.foo
-   * ```
    */
-  class FieldExpr extends @field_expr, Expr {
-    override string toString() { result = "FieldExpr" }
+  class ParamList extends @param_list, AstNode {
+    override string toString() { result = "ParamList" }
 
     /**
-     * Gets the expression of this field expression.
+     * Gets the `index`th parameter of this parameter list (0-based).
      */
-    Expr getExpr() { field_exprs(this, result, _) }
+    Param getParam(int index) { param_list_params(this, index, result) }
 
     /**
-     * Gets the name of this field expression.
+     * Gets the self parameter of this parameter list, if it exists.
      */
-    string getName() { field_exprs(this, _, result) }
+    SelfParam getSelfParam() { param_list_self_params(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A function declaration. For example
-   * ```
-   * fn foo(x: u32) -> u64 {(x + 1).into()}
-   * ```
-   * A function declaration within a trait might not have a body:
-   * ```
-   * trait Trait {
-   *     fn bar();
-   * }
-   * ```
    */
-  class Function extends @function, Declaration {
-    override string toString() { result = "Function" }
+  class Pat extends @pat, AstNode { }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class Path extends @path, AstNode {
+    override string toString() { result = "Path" }
 
     /**
-     * Gets the name of this function.
+     * Gets the qualifier of this path, if it exists.
      */
-    string getName() { functions(this, result, _) }
+    Path getQualifier() { path_qualifiers(this, result) }
 
     /**
-     * Gets the body of this function.
+     * Gets the part of this path, if it exists.
      */
-    Expr getBody() { functions(this, _, result) }
+    PathSegment getPart() { path_parts(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A binding pattern. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) => y,
-   *     Option::None => 0,
-   * };
-   * ```
-   * ```
-   * match x {
-   *     y@Option::Some(_) => y,
-   *     Option::None => 0,
-   * };
-   * ```
    */
-  class IdentPat extends @ident_pat, Pat {
-    override string toString() { result = "IdentPat" }
+  class PathSegment extends @path_segment, AstNode {
+    override string toString() { result = "PathSegment" }
 
     /**
-     * Gets the binding of this ident pat.
+     * Gets the generic argument list of this path segment, if it exists.
      */
-    string getBindingId() { ident_pats(this, result) }
+    GenericArgList getGenericArgList() { path_segment_generic_arg_lists(this, result) }
 
     /**
-     * Gets the subpat of this ident pat, if it exists.
+     * Gets the name reference of this path segment, if it exists.
      */
-    Pat getSubpat() { ident_pat_subpats(this, result) }
-  }
+    NameRef getNameRef() { path_segment_name_refs(this, result) }
 
-  /**
-   * INTERNAL: Do not use.
-   * An `if` expression. For example:
-   * ```
-   * if x == 42 {
-   *     println!("that's the answer");
-   * }
-   * ```
-   * ```
-   * let y = if x > 0 {
-   *     1
-   * } else {
-   *     0
-   * }
-   * ```
-   */
-  class IfExpr extends @if_expr, Expr {
-    override string toString() { result = "IfExpr" }
+    /**
+     * Gets the parameter list of this path segment, if it exists.
+     */
+    ParamList getParamList() { path_segment_param_lists(this, result) }
 
     /**
-     * Gets the condition of this if expression.
+     * Gets the path type of this path segment, if it exists.
      */
-    Expr getCondition() { if_exprs(this, result, _) }
+    PathType getPathType() { path_segment_path_types(this, result) }
 
     /**
-     * Gets the then of this if expression.
+     * Gets the ret type of this path segment, if it exists.
      */
-    Expr getThen() { if_exprs(this, _, result) }
+    RetType getRetType() { path_segment_ret_types(this, result) }
 
     /**
-     * Gets the else of this if expression, if it exists.
+     * Gets the return type syntax of this path segment, if it exists.
      */
-    Expr getElse() { if_expr_elses(this, result) }
+    ReturnTypeSyntax getReturnTypeSyntax() { path_segment_return_type_syntaxes(this, result) }
+
+    /**
+     * Gets the ty of this path segment, if it exists.
+     */
+    Type getTy() { path_segment_ties(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An index expression. For example:
-   * ```
-   * list[42];
-   * list[42] = 1;
-   * ```
    */
-  class IndexExpr extends @index_expr, Expr {
-    override string toString() { result = "IndexExpr" }
+  class RecordExprField extends @record_expr_field, AstNode {
+    override string toString() { result = "RecordExprField" }
 
     /**
-     * Gets the base of this index expression.
+     * Gets the `index`th attr of this record expression field (0-based).
      */
-    Expr getBase() { index_exprs(this, result, _) }
+    Attr getAttr(int index) { record_expr_field_attrs(this, index, result) }
 
     /**
-     * Gets the index of this index expression.
+     * Gets the expression of this record expression field, if it exists.
      */
-    Expr getIndex() { index_exprs(this, _, result) }
+    Expr getExpr() { record_expr_field_exprs(this, result) }
 
     /**
-     * Holds if this index expression is assignee expression.
+     * Gets the name reference of this record expression field, if it exists.
      */
-    predicate isAssigneeExpr() { index_expr_is_assignee_expr(this) }
+    NameRef getNameRef() { record_expr_field_name_refs(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An item statement. For example:
-   * ```
-   * fn print_hello() {
-   *     println!("Hello, world!");
-   * }
-   * print_hello();
-   * ```
    */
-  class ItemStmt extends @item_stmt, Stmt {
-    override string toString() { result = "ItemStmt" }
-  }
+  class RecordExprFieldList extends @record_expr_field_list, AstNode {
+    override string toString() { result = "RecordExprFieldList" }
 
-  /**
-   * INTERNAL: Do not use.
-   * A `let` expression. For example:
-   * ```
-   * if let Some(x) = maybe_some {
-   *     println!("{}", x);
-   * }
-   * ```
-   */
-  class LetExpr extends @let_expr, Expr {
-    override string toString() { result = "LetExpr" }
+    /**
+     * Gets the `index`th attr of this record expression field list (0-based).
+     */
+    Attr getAttr(int index) { record_expr_field_list_attrs(this, index, result) }
 
     /**
-     * Gets the pat of this let expression.
+     * Gets the `index`th field of this record expression field list (0-based).
      */
-    Pat getPat() { let_exprs(this, result, _) }
+    RecordExprField getField(int index) { record_expr_field_list_fields(this, index, result) }
 
     /**
-     * Gets the expression of this let expression.
+     * Gets the spread of this record expression field list, if it exists.
      */
-    Expr getExpr() { let_exprs(this, _, result) }
+    Expr getSpread() { record_expr_field_list_spreads(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A let statement. For example:
-   * ```
-   * let x = 42;
-   * let x: i32 = 42;
-   * let x: i32;
-   * let x;
-   * let (x, y) = (1, 2);
-   * let Some(x) = std::env::var("FOO") else {
-   *     return;
-   * };
    */
-  class LetStmt extends @let_stmt, Stmt {
-    override string toString() { result = "LetStmt" }
+  class RecordField extends @record_field, AstNode {
+    override string toString() { result = "RecordField" }
 
     /**
-     * Gets the pat of this let statement.
+     * Gets the `index`th attr of this record field (0-based).
      */
-    Pat getPat() { let_stmts(this, result) }
+    Attr getAttr(int index) { record_field_attrs(this, index, result) }
 
     /**
-     * Gets the type of this let statement, if it exists.
+     * Gets the name of this record field, if it exists.
      */
-    TypeRef getType() { let_stmt_types(this, result) }
+    Name getName() { record_field_names(this, result) }
 
     /**
-     * Gets the initializer of this let statement, if it exists.
+     * Gets the ty of this record field, if it exists.
      */
-    Expr getInitializer() { let_stmt_initializers(this, result) }
+    Type getTy() { record_field_ties(this, result) }
 
     /**
-     * Gets the else of this let statement, if it exists.
+     * Gets the visibility of this record field, if it exists.
      */
-    Expr getElse() { let_stmt_elses(this, result) }
+    Visibility getVisibility() { record_field_visibilities(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A literal expression. For example:
-   * ```
-   * 42;
-   * 42.0;
-   * "Hello, world!";
-   * b"Hello, world!";
-   * 'x';
-   * b'x';
-   * r"Hello, world!";
-   * true;
    */
-  class LiteralExpr extends @literal_expr, Expr {
-    override string toString() { result = "LiteralExpr" }
-  }
+  class RecordPatField extends @record_pat_field, AstNode {
+    override string toString() { result = "RecordPatField" }
 
-  /**
-   * INTERNAL: Do not use.
-   * A literal pattern. For example:
-   * ```
-   * match x {
-   *     42 => "ok",
-   *     _ => "fail",
-   * }
-   * ```
-   */
-  class LiteralPat extends @literal_pat, Pat {
-    override string toString() { result = "LiteralPat" }
+    /**
+     * Gets the `index`th attr of this record pat field (0-based).
+     */
+    Attr getAttr(int index) { record_pat_field_attrs(this, index, result) }
+
+    /**
+     * Gets the name reference of this record pat field, if it exists.
+     */
+    NameRef getNameRef() { record_pat_field_name_refs(this, result) }
 
     /**
-     * Gets the expression of this literal pat.
+     * Gets the pat of this record pat field, if it exists.
      */
-    Expr getExpr() { literal_pats(this, result) }
+    Pat getPat() { record_pat_field_pats(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A loop expression. For example:
-   * ```
-   * loop {
-   *     println!("Hello, world (again)!");
-   * };
-   * ```
-   * ```
-   * 'label: loop {
-   *     println!("Hello, world (once)!");
-   *     break 'label;
-   * };
-   * ```
-   * ```
-   * let mut x = 0;
-   * loop {
-   *     if x < 10 {
-   *         x += 1;
-   *     } else {
-   *         break;
-   *     }
-   * };
-   * ```
    */
-  class LoopExpr extends @loop_expr, Expr {
-    override string toString() { result = "LoopExpr" }
+  class RecordPatFieldList extends @record_pat_field_list, AstNode {
+    override string toString() { result = "RecordPatFieldList" }
 
     /**
-     * Gets the body of this loop expression.
+     * Gets the `index`th field of this record pat field list (0-based).
      */
-    Expr getBody() { loop_exprs(this, result) }
+    RecordPatField getField(int index) { record_pat_field_list_fields(this, index, result) }
 
     /**
-     * Gets the label of this loop expression, if it exists.
+     * Gets the rest pat of this record pat field list, if it exists.
      */
-    Label getLabel() { loop_expr_labels(this, result) }
+    RestPat getRestPat() { record_pat_field_list_rest_pats(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A match expression. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) => y,
-   *     Option::None => 0,
-   * }
-   * ```
-   * ```
-   * match x {
-   *     Some(y) if y != 0 => 1 / y,
-   *     _ => 0,
-   * }
-   * ```
    */
-  class MatchExpr extends @match_expr, Expr {
-    override string toString() { result = "MatchExpr" }
+  class Rename extends @rename, AstNode {
+    override string toString() { result = "Rename" }
 
     /**
-     * Gets the expression of this match expression.
+     * Gets the name of this rename, if it exists.
      */
-    Expr getExpr() { match_exprs(this, result) }
+    Name getName() { rename_names(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class RetType extends @ret_type, AstNode {
+    override string toString() { result = "RetType" }
 
     /**
-     * Gets the `index`th branch of this match expression (0-based).
+     * Gets the ty of this ret type, if it exists.
      */
-    MatchArm getBranch(int index) { match_expr_branches(this, index, result) }
+    Type getTy() { ret_type_ties(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A method call expression. For example:
-   * ```
-   * x.foo(42);
-   * x.foo::<u32, u64>(42);
    */
-  class MethodCallExpr extends @method_call_expr, Expr {
-    override string toString() { result = "MethodCallExpr" }
+  class ReturnTypeSyntax extends @return_type_syntax, AstNode {
+    override string toString() { result = "ReturnTypeSyntax" }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class SelfParam extends @self_param, AstNode {
+    override string toString() { result = "SelfParam" }
 
     /**
-     * Gets the receiver of this method call expression.
+     * Gets the `index`th attr of this self parameter (0-based).
      */
-    Expr getReceiver() { method_call_exprs(this, result, _) }
+    Attr getAttr(int index) { self_param_attrs(this, index, result) }
 
     /**
-     * Gets the method name of this method call expression.
+     * Gets the lifetime of this self parameter, if it exists.
      */
-    string getMethodName() { method_call_exprs(this, _, result) }
+    Lifetime getLifetime() { self_param_lifetimes(this, result) }
 
     /**
-     * Gets the `index`th argument of this method call expression (0-based).
+     * Gets the name of this self parameter, if it exists.
      */
-    Expr getArg(int index) { method_call_expr_args(this, index, result) }
+    Name getName() { self_param_names(this, result) }
 
     /**
-     * Gets the generic arguments of this method call expression, if it exists.
+     * Gets the ty of this self parameter, if it exists.
      */
-    GenericArgList getGenericArgs() { method_call_expr_generic_args(this, result) }
+    Type getTy() { self_param_ties(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A missing expression, used as a placeholder for incomplete syntax.
-   *
-   * ```
-   * let x = non_existing_macro!();
-   * ```
    */
-  class MissingExpr extends @missing_expr, Expr, Missing {
-    override string toString() { result = "MissingExpr" }
+  class SourceFile extends @source_file, AstNode {
+    override string toString() { result = "SourceFile" }
+
+    /**
+     * Gets the `index`th attr of this source file (0-based).
+     */
+    Attr getAttr(int index) { source_file_attrs(this, index, result) }
+
+    /**
+     * Gets the `index`th item of this source file (0-based).
+     */
+    Item getItem(int index) { source_file_items(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A missing pattern, used as a place holder for incomplete syntax.
-   * ```
-   * match Some(42) {
-   *     .. => "bad use of .. syntax",
-   * };
-   * ```
    */
-  class MissingPat extends @missing_pat, Pat, Missing {
-    override string toString() { result = "MissingPat" }
-  }
+  class Stmt extends @stmt, AstNode { }
 
   /**
    * INTERNAL: Do not use.
-   * A module declaration. For example:
-   * ```
-   * mod foo;
-   * ```
-   * ```
-   * mod bar {
-   *     pub fn baz() {}
-   * }
-   * ```
    */
-  class Module extends @module, Declaration {
-    override string toString() { result = "Module" }
+  class StmtList extends @stmt_list, AstNode {
+    override string toString() { result = "StmtList" }
 
     /**
-     * Gets the `index`th declaration of this module (0-based).
+     * Gets the `index`th attr of this statement list (0-based).
      */
-    Declaration getDeclaration(int index) { module_declarations(this, index, result) }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   *  An `offset_of` expression. For example:
-   * ```
-   * builtin # offset_of(Struct, field);
-   * ```
-   */
-  class OffsetOfExpr extends @offset_of_expr, Expr {
-    override string toString() { result = "OffsetOfExpr" }
+    Attr getAttr(int index) { stmt_list_attrs(this, index, result) }
 
     /**
-     * Gets the container of this offset of expression.
+     * Gets the `index`th statement of this statement list (0-based).
      */
-    TypeRef getContainer() { offset_of_exprs(this, result) }
+    Stmt getStatement(int index) { stmt_list_statements(this, index, result) }
 
     /**
-     * Gets the `index`th field of this offset of expression (0-based).
+     * Gets the tail expression of this statement list, if it exists.
      */
-    string getField(int index) { offset_of_expr_fields(this, index, result) }
+    Expr getTailExpr() { stmt_list_tail_exprs(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An or pattern. For example:
-   * ```
-   * match x {
-   *     Option::Some(y) | Option::None => 0,
-   * }
-   * ```
    */
-  class OrPat extends @or_pat, Pat {
-    override string toString() { result = "OrPat" }
-
-    /**
-     * Gets the `index`th argument of this or pat (0-based).
-     */
-    Pat getArg(int index) { or_pat_args(this, index, result) }
+  class TokenTree extends @token_tree, AstNode {
+    override string toString() { result = "TokenTree" }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A path expression. For example:
-   * ```
-   * let x = variable;
-   * let x = foo::bar;
-   * let y = <T>::foo;
-   * let z = <TypeRef as Trait>::foo;
-   * ```
    */
-  class PathExpr extends @path_expr, Expr {
-    override string toString() { result = "PathExpr" }
+  class TupleField extends @tuple_field, AstNode {
+    override string toString() { result = "TupleField" }
+
+    /**
+     * Gets the `index`th attr of this tuple field (0-based).
+     */
+    Attr getAttr(int index) { tuple_field_attrs(this, index, result) }
+
+    /**
+     * Gets the ty of this tuple field, if it exists.
+     */
+    Type getTy() { tuple_field_ties(this, result) }
 
     /**
-     * Gets the path of this path expression.
+     * Gets the visibility of this tuple field, if it exists.
      */
-    Path getPath() { path_exprs(this, result) }
+    Visibility getVisibility() { tuple_field_visibilities(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A path pattern. For example:
-   * ```
-   * match x {
-   *     Foo::Bar => "ok",
-   *     _ => "fail",
-   * }
-   * ```
    */
-  class PathPat extends @path_pat, Pat {
-    override string toString() { result = "PathPat" }
+  class Type extends @type, AstNode { }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TypeBound extends @type_bound, AstNode {
+    override string toString() { result = "TypeBound" }
+
+    /**
+     * Gets the generic parameter list of this type bound, if it exists.
+     */
+    GenericParamList getGenericParamList() { type_bound_generic_param_lists(this, result) }
+
+    /**
+     * Gets the lifetime of this type bound, if it exists.
+     */
+    Lifetime getLifetime() { type_bound_lifetimes(this, result) }
 
     /**
-     * Gets the path of this path pat.
+     * Gets the ty of this type bound, if it exists.
      */
-    Path getPath() { path_pats(this, result) }
+    Type getTy() { type_bound_ties(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A unary operation expression. For example:
-   * ```
-   * let x = -42
-   * let y = !true
-   * let z = *ptr
-   * ```
    */
-  class PrefixExpr extends @prefix_expr, Expr {
-    override string toString() { result = "PrefixExpr" }
-
-    /**
-     * Gets the expression of this prefix expression.
-     */
-    Expr getExpr() { prefix_exprs(this, result, _) }
+  class TypeBoundList extends @type_bound_list, AstNode {
+    override string toString() { result = "TypeBoundList" }
 
     /**
-     * Gets the op of this prefix expression.
+     * Gets the `index`th bound of this type bound list (0-based).
      */
-    string getOp() { prefix_exprs(this, _, result) }
+    TypeBound getBound(int index) { type_bound_list_bounds(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A range expression. For example:
-   * ```
-   * let x = 1..=10;
-   * let x = 1..10;
-   * let x = 10..;
-   * let x = ..10;
-   * let x = ..=10;
-   * let x = ..;
-   * ```
    */
-  class RangeExpr extends @range_expr, Expr {
-    override string toString() { result = "RangeExpr" }
+  class UseTree extends @use_tree, AstNode {
+    override string toString() { result = "UseTree" }
 
     /**
-     * Gets the lhs of this range expression, if it exists.
+     * Gets the path of this use tree, if it exists.
      */
-    Expr getLhs() { range_expr_lhs(this, result) }
+    Path getPath() { use_tree_paths(this, result) }
 
     /**
-     * Gets the rhs of this range expression, if it exists.
+     * Gets the rename of this use tree, if it exists.
      */
-    Expr getRhs() { range_expr_rhs(this, result) }
+    Rename getRename() { use_tree_renames(this, result) }
 
     /**
-     * Holds if this range expression is inclusive.
+     * Gets the use tree list of this use tree, if it exists.
      */
-    predicate isInclusive() { range_expr_is_inclusive(this) }
+    UseTreeList getUseTreeList() { use_tree_use_tree_lists(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A range pattern. For example:
-   * ```
-   * match x {
-   *     ..15 => "too cold",
-   *     16..=25 => "just right",
-   *     26.. => "too hot",
-   * }
-   * ```
    */
-  class RangePat extends @range_pat, Pat {
-    override string toString() { result = "RangePat" }
-
-    /**
-     * Gets the start of this range pat, if it exists.
-     */
-    Pat getStart() { range_pat_starts(this, result) }
+  class UseTreeList extends @use_tree_list, AstNode {
+    override string toString() { result = "UseTreeList" }
 
     /**
-     * Gets the end of this range pat, if it exists.
+     * Gets the `index`th use tree of this use tree list (0-based).
      */
-    Pat getEnd() { range_pat_ends(this, result) }
+    UseTree getUseTree(int index) { use_tree_list_use_trees(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A record expression. For example:
-   * ```
-   * let first = Foo { a: 1, b: 2 };
-   * let second = Foo { a: 2, ..first };
-   * Foo { a: 1, b: 2 }[2] = 10;
-   * Foo { .. } = second;
-   * ```
    */
-  class RecordExpr extends @record_expr, Expr {
-    override string toString() { result = "RecordExpr" }
+  class Variant extends @variant, AstNode {
+    override string toString() { result = "Variant" }
 
     /**
-     * Gets the path of this record expression, if it exists.
+     * Gets the `index`th attr of this variant (0-based).
      */
-    Path getPath() { record_expr_paths(this, result) }
+    Attr getAttr(int index) { variant_attrs(this, index, result) }
 
     /**
-     * Gets the `index`th fld of this record expression (0-based).
+     * Gets the expression of this variant, if it exists.
      */
-    RecordExprField getFld(int index) { record_expr_flds(this, index, result) }
+    Expr getExpr() { variant_exprs(this, result) }
 
     /**
-     * Gets the spread of this record expression, if it exists.
+     * Gets the field list of this variant, if it exists.
      */
-    Expr getSpread() { record_expr_spreads(this, result) }
+    FieldList getFieldList() { variant_field_lists(this, result) }
 
     /**
-     * Holds if this record expression has ellipsis.
+     * Gets the name of this variant, if it exists.
      */
-    predicate hasEllipsis() { record_expr_has_ellipsis(this) }
+    Name getName() { variant_names(this, result) }
 
     /**
-     * Holds if this record expression is assignee expression.
+     * Gets the visibility of this variant, if it exists.
      */
-    predicate isAssigneeExpr() { record_expr_is_assignee_expr(this) }
+    Visibility getVisibility() { variant_visibilities(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A record pattern. For example:
-   * ```
-   * match x {
-   *     Foo { a: 1, b: 2 } => "ok",
-   *     Foo { .. } => "fail",
-   * }
-   * ```
    */
-  class RecordPat extends @record_pat, Pat {
-    override string toString() { result = "RecordPat" }
+  class VariantList extends @variant_list, AstNode {
+    override string toString() { result = "VariantList" }
 
     /**
-     * Gets the path of this record pat, if it exists.
+     * Gets the `index`th variant of this variant list (0-based).
      */
-    Path getPath() { record_pat_paths(this, result) }
+    Variant getVariant(int index) { variant_list_variants(this, index, result) }
+  }
 
-    /**
-     * Gets the `index`th fld of this record pat (0-based).
-     */
-    RecordPatField getFld(int index) { record_pat_flds(this, index, result) }
+  /**
+   * INTERNAL: Do not use.
+   */
+  class Visibility extends @visibility, AstNode {
+    override string toString() { result = "Visibility" }
 
     /**
-     * Holds if this record pat has ellipsis.
+     * Gets the path of this visibility, if it exists.
      */
-    predicate hasEllipsis() { record_pat_has_ellipsis(this) }
+    Path getPath() { visibility_paths(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A reference expression. For example:
-   * ```
-   *     let ref_const = &foo;
-   *     let ref_mut = &mut foo;
-   *     let raw_const: &mut i32 = &raw const foo;
-   *     let raw_mut: &mut i32 = &raw mut foo;
-   * ```
    */
-  class RefExpr extends @ref_expr, Expr {
-    override string toString() { result = "RefExpr" }
+  class WhereClause extends @where_clause, AstNode {
+    override string toString() { result = "WhereClause" }
 
     /**
-     * Gets the expression of this reference expression.
+     * Gets the `index`th predicate of this where clause (0-based).
      */
-    Expr getExpr() { ref_exprs(this, result) }
+    WherePred getPredicate(int index) { where_clause_predicates(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class WherePred extends @where_pred, AstNode {
+    override string toString() { result = "WherePred" }
+
+    /**
+     * Gets the generic parameter list of this where pred, if it exists.
+     */
+    GenericParamList getGenericParamList() { where_pred_generic_param_lists(this, result) }
+
+    /**
+     * Gets the lifetime of this where pred, if it exists.
+     */
+    Lifetime getLifetime() { where_pred_lifetimes(this, result) }
+
+    /**
+     * Gets the ty of this where pred, if it exists.
+     */
+    Type getTy() { where_pred_ties(this, result) }
+
+    /**
+     * Gets the type bound list of this where pred, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { where_pred_type_bound_lists(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ArrayExpr extends @array_expr, Expr {
+    override string toString() { result = "ArrayExpr" }
+
+    /**
+     * Gets the `index`th attr of this array expression (0-based).
+     */
+    Attr getAttr(int index) { array_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the `index`th expression of this array expression (0-based).
+     */
+    Expr getExpr(int index) { array_expr_exprs(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ArrayType extends @array_type, Type {
+    override string toString() { result = "ArrayType" }
+
+    /**
+     * Gets the const argument of this array type, if it exists.
+     */
+    ConstArg getConstArg() { array_type_const_args(this, result) }
+
+    /**
+     * Gets the ty of this array type, if it exists.
+     */
+    Type getTy() { array_type_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class AsmExpr extends @asm_expr, Expr {
+    override string toString() { result = "AsmExpr" }
+
+    /**
+     * Gets the `index`th attr of this asm expression (0-based).
+     */
+    Attr getAttr(int index) { asm_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this asm expression, if it exists.
+     */
+    Expr getExpr() { asm_expr_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class AssocTypeArg extends @assoc_type_arg, GenericArg {
+    override string toString() { result = "AssocTypeArg" }
+
+    /**
+     * Gets the const argument of this assoc type argument, if it exists.
+     */
+    ConstArg getConstArg() { assoc_type_arg_const_args(this, result) }
+
+    /**
+     * Gets the generic argument list of this assoc type argument, if it exists.
+     */
+    GenericArgList getGenericArgList() { assoc_type_arg_generic_arg_lists(this, result) }
+
+    /**
+     * Gets the name reference of this assoc type argument, if it exists.
+     */
+    NameRef getNameRef() { assoc_type_arg_name_refs(this, result) }
+
+    /**
+     * Gets the parameter list of this assoc type argument, if it exists.
+     */
+    ParamList getParamList() { assoc_type_arg_param_lists(this, result) }
+
+    /**
+     * Gets the ret type of this assoc type argument, if it exists.
+     */
+    RetType getRetType() { assoc_type_arg_ret_types(this, result) }
+
+    /**
+     * Gets the return type syntax of this assoc type argument, if it exists.
+     */
+    ReturnTypeSyntax getReturnTypeSyntax() { assoc_type_arg_return_type_syntaxes(this, result) }
+
+    /**
+     * Gets the ty of this assoc type argument, if it exists.
+     */
+    Type getTy() { assoc_type_arg_ties(this, result) }
+
+    /**
+     * Gets the type bound list of this assoc type argument, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { assoc_type_arg_type_bound_lists(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class AwaitExpr extends @await_expr, Expr {
+    override string toString() { result = "AwaitExpr" }
+
+    /**
+     * Gets the `index`th attr of this await expression (0-based).
+     */
+    Attr getAttr(int index) { await_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this await expression, if it exists.
+     */
+    Expr getExpr() { await_expr_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class BecomeExpr extends @become_expr, Expr {
+    override string toString() { result = "BecomeExpr" }
+
+    /**
+     * Gets the `index`th attr of this become expression (0-based).
+     */
+    Attr getAttr(int index) { become_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this become expression, if it exists.
+     */
+    Expr getExpr() { become_expr_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class BinaryExpr extends @binary_expr, Expr {
+    override string toString() { result = "BinaryExpr" }
+
+    /**
+     * Gets the `index`th attr of this binary expression (0-based).
+     */
+    Attr getAttr(int index) { binary_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the lhs of this binary expression, if it exists.
+     */
+    Expr getLhs() { binary_expr_lhs(this, result) }
+
+    /**
+     * Gets the rhs of this binary expression, if it exists.
+     */
+    Expr getRhs() { binary_expr_rhs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class BlockExpr extends @block_expr, Expr {
+    override string toString() { result = "BlockExpr" }
+
+    /**
+     * Gets the `index`th attr of this block expression (0-based).
+     */
+    Attr getAttr(int index) { block_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the label of this block expression, if it exists.
+     */
+    Label getLabel() { block_expr_labels(this, result) }
+
+    /**
+     * Gets the statement list of this block expression, if it exists.
+     */
+    StmtList getStmtList() { block_expr_stmt_lists(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class BoxPat extends @box_pat, Pat {
+    override string toString() { result = "BoxPat" }
+
+    /**
+     * Gets the pat of this box pat, if it exists.
+     */
+    Pat getPat() { box_pat_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class BreakExpr extends @break_expr, Expr {
+    override string toString() { result = "BreakExpr" }
+
+    /**
+     * Gets the `index`th attr of this break expression (0-based).
+     */
+    Attr getAttr(int index) { break_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this break expression, if it exists.
+     */
+    Expr getExpr() { break_expr_exprs(this, result) }
+
+    /**
+     * Gets the lifetime of this break expression, if it exists.
+     */
+    Lifetime getLifetime() { break_expr_lifetimes(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class CallExpr extends @call_expr, Expr {
+    override string toString() { result = "CallExpr" }
+
+    /**
+     * Gets the argument list of this call expression, if it exists.
+     */
+    ArgList getArgList() { call_expr_arg_lists(this, result) }
+
+    /**
+     * Gets the `index`th attr of this call expression (0-based).
+     */
+    Attr getAttr(int index) { call_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this call expression, if it exists.
+     */
+    Expr getExpr() { call_expr_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class CastExpr extends @cast_expr, Expr {
+    override string toString() { result = "CastExpr" }
+
+    /**
+     * Gets the `index`th attr of this cast expression (0-based).
+     */
+    Attr getAttr(int index) { cast_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this cast expression, if it exists.
+     */
+    Expr getExpr() { cast_expr_exprs(this, result) }
+
+    /**
+     * Gets the ty of this cast expression, if it exists.
+     */
+    Type getTy() { cast_expr_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ClosureExpr extends @closure_expr, Expr {
+    override string toString() { result = "ClosureExpr" }
+
+    /**
+     * Gets the `index`th attr of this closure expression (0-based).
+     */
+    Attr getAttr(int index) { closure_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the body of this closure expression, if it exists.
+     */
+    Expr getBody() { closure_expr_bodies(this, result) }
+
+    /**
+     * Gets the closure binder of this closure expression, if it exists.
+     */
+    ClosureBinder getClosureBinder() { closure_expr_closure_binders(this, result) }
+
+    /**
+     * Gets the parameter list of this closure expression, if it exists.
+     */
+    ParamList getParamList() { closure_expr_param_lists(this, result) }
+
+    /**
+     * Gets the ret type of this closure expression, if it exists.
+     */
+    RetType getRetType() { closure_expr_ret_types(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ConstArg extends @const_arg, GenericArg {
+    override string toString() { result = "ConstArg" }
+
+    /**
+     * Gets the expression of this const argument, if it exists.
+     */
+    Expr getExpr() { const_arg_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ConstBlockPat extends @const_block_pat, Pat {
+    override string toString() { result = "ConstBlockPat" }
+
+    /**
+     * Gets the block expression of this const block pat, if it exists.
+     */
+    BlockExpr getBlockExpr() { const_block_pat_block_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ConstParam extends @const_param, GenericParam {
+    override string toString() { result = "ConstParam" }
+
+    /**
+     * Gets the `index`th attr of this const parameter (0-based).
+     */
+    Attr getAttr(int index) { const_param_attrs(this, index, result) }
+
+    /**
+     * Gets the default val of this const parameter, if it exists.
+     */
+    ConstArg getDefaultVal() { const_param_default_vals(this, result) }
+
+    /**
+     * Gets the name of this const parameter, if it exists.
+     */
+    Name getName() { const_param_names(this, result) }
+
+    /**
+     * Gets the ty of this const parameter, if it exists.
+     */
+    Type getTy() { const_param_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ContinueExpr extends @continue_expr, Expr {
+    override string toString() { result = "ContinueExpr" }
+
+    /**
+     * Gets the `index`th attr of this continue expression (0-based).
+     */
+    Attr getAttr(int index) { continue_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the lifetime of this continue expression, if it exists.
+     */
+    Lifetime getLifetime() { continue_expr_lifetimes(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class DynTraitType extends @dyn_trait_type, Type {
+    override string toString() { result = "DynTraitType" }
+
+    /**
+     * Gets the type bound list of this dyn trait type, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { dyn_trait_type_type_bound_lists(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ExprStmt extends @expr_stmt, Stmt {
+    override string toString() { result = "ExprStmt" }
+
+    /**
+     * Gets the expression of this expression statement, if it exists.
+     */
+    Expr getExpr() { expr_stmt_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class FieldExpr extends @field_expr, Expr {
+    override string toString() { result = "FieldExpr" }
+
+    /**
+     * Gets the `index`th attr of this field expression (0-based).
+     */
+    Attr getAttr(int index) { field_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this field expression, if it exists.
+     */
+    Expr getExpr() { field_expr_exprs(this, result) }
+
+    /**
+     * Gets the name reference of this field expression, if it exists.
+     */
+    NameRef getNameRef() { field_expr_name_refs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class FnPtrType extends @fn_ptr_type, Type {
+    override string toString() { result = "FnPtrType" }
+
+    /**
+     * Gets the abi of this fn ptr type, if it exists.
+     */
+    Abi getAbi() { fn_ptr_type_abis(this, result) }
+
+    /**
+     * Gets the parameter list of this fn ptr type, if it exists.
+     */
+    ParamList getParamList() { fn_ptr_type_param_lists(this, result) }
+
+    /**
+     * Gets the ret type of this fn ptr type, if it exists.
+     */
+    RetType getRetType() { fn_ptr_type_ret_types(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ForExpr extends @for_expr, Expr {
+    override string toString() { result = "ForExpr" }
+
+    /**
+     * Gets the `index`th attr of this for expression (0-based).
+     */
+    Attr getAttr(int index) { for_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the iterable of this for expression, if it exists.
+     */
+    Expr getIterable() { for_expr_iterables(this, result) }
+
+    /**
+     * Gets the label of this for expression, if it exists.
+     */
+    Label getLabel() { for_expr_labels(this, result) }
+
+    /**
+     * Gets the loop body of this for expression, if it exists.
+     */
+    BlockExpr getLoopBody() { for_expr_loop_bodies(this, result) }
+
+    /**
+     * Gets the pat of this for expression, if it exists.
+     */
+    Pat getPat() { for_expr_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ForType extends @for_type, Type {
+    override string toString() { result = "ForType" }
+
+    /**
+     * Gets the generic parameter list of this for type, if it exists.
+     */
+    GenericParamList getGenericParamList() { for_type_generic_param_lists(this, result) }
+
+    /**
+     * Gets the ty of this for type, if it exists.
+     */
+    Type getTy() { for_type_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class FormatArgsExpr extends @format_args_expr, Expr {
+    override string toString() { result = "FormatArgsExpr" }
+
+    /**
+     * Gets the `index`th argument of this format arguments expression (0-based).
+     */
+    FormatArgsArg getArg(int index) { format_args_expr_args(this, index, result) }
+
+    /**
+     * Gets the `index`th attr of this format arguments expression (0-based).
+     */
+    Attr getAttr(int index) { format_args_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the template of this format arguments expression, if it exists.
+     */
+    Expr getTemplate() { format_args_expr_templates(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class IdentPat extends @ident_pat, Pat {
+    override string toString() { result = "IdentPat" }
+
+    /**
+     * Gets the `index`th attr of this ident pat (0-based).
+     */
+    Attr getAttr(int index) { ident_pat_attrs(this, index, result) }
+
+    /**
+     * Gets the name of this ident pat, if it exists.
+     */
+    Name getName() { ident_pat_names(this, result) }
+
+    /**
+     * Gets the pat of this ident pat, if it exists.
+     */
+    Pat getPat() { ident_pat_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class IfExpr extends @if_expr, Expr {
+    override string toString() { result = "IfExpr" }
+
+    /**
+     * Gets the `index`th attr of this if expression (0-based).
+     */
+    Attr getAttr(int index) { if_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the condition of this if expression, if it exists.
+     */
+    Expr getCondition() { if_expr_conditions(this, result) }
+
+    /**
+     * Gets the else branch of this if expression, if it exists.
+     */
+    Expr getElseBranch() { if_expr_else_branches(this, result) }
+
+    /**
+     * Gets the then branch of this if expression, if it exists.
+     */
+    BlockExpr getThenBranch() { if_expr_then_branches(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ImplTraitType extends @impl_trait_type, Type {
+    override string toString() { result = "ImplTraitType" }
+
+    /**
+     * Gets the type bound list of this impl trait type, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { impl_trait_type_type_bound_lists(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class IndexExpr extends @index_expr, Expr {
+    override string toString() { result = "IndexExpr" }
+
+    /**
+     * Gets the `index`th attr of this index expression (0-based).
+     */
+    Attr getAttr(int index) { index_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the base of this index expression, if it exists.
+     */
+    Expr getBase() { index_expr_bases(this, result) }
+
+    /**
+     * Gets the index of this index expression, if it exists.
+     */
+    Expr getIndex() { index_expr_indices(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class InferType extends @infer_type, Type {
+    override string toString() { result = "InferType" }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class Item extends @item, Stmt { }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class LetExpr extends @let_expr, Expr {
+    override string toString() { result = "LetExpr" }
+
+    /**
+     * Gets the `index`th attr of this let expression (0-based).
+     */
+    Attr getAttr(int index) { let_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this let expression, if it exists.
+     */
+    Expr getExpr() { let_expr_exprs(this, result) }
+
+    /**
+     * Gets the pat of this let expression, if it exists.
+     */
+    Pat getPat() { let_expr_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class LetStmt extends @let_stmt, Stmt {
+    override string toString() { result = "LetStmt" }
+
+    /**
+     * Gets the `index`th attr of this let statement (0-based).
+     */
+    Attr getAttr(int index) { let_stmt_attrs(this, index, result) }
+
+    /**
+     * Gets the initializer of this let statement, if it exists.
+     */
+    Expr getInitializer() { let_stmt_initializers(this, result) }
+
+    /**
+     * Gets the let else of this let statement, if it exists.
+     */
+    LetElse getLetElse() { let_stmt_let_elses(this, result) }
+
+    /**
+     * Gets the pat of this let statement, if it exists.
+     */
+    Pat getPat() { let_stmt_pats(this, result) }
+
+    /**
+     * Gets the ty of this let statement, if it exists.
+     */
+    Type getTy() { let_stmt_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class LifetimeArg extends @lifetime_arg, GenericArg {
+    override string toString() { result = "LifetimeArg" }
+
+    /**
+     * Gets the lifetime of this lifetime argument, if it exists.
+     */
+    Lifetime getLifetime() { lifetime_arg_lifetimes(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class LifetimeParam extends @lifetime_param, GenericParam {
+    override string toString() { result = "LifetimeParam" }
+
+    /**
+     * Gets the `index`th attr of this lifetime parameter (0-based).
+     */
+    Attr getAttr(int index) { lifetime_param_attrs(this, index, result) }
+
+    /**
+     * Gets the lifetime of this lifetime parameter, if it exists.
+     */
+    Lifetime getLifetime() { lifetime_param_lifetimes(this, result) }
+
+    /**
+     * Gets the type bound list of this lifetime parameter, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { lifetime_param_type_bound_lists(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class Literal extends @literal, Expr {
+    override string toString() { result = "Literal" }
+
+    /**
+     * Gets the `index`th attr of this literal (0-based).
+     */
+    Attr getAttr(int index) { literal_attrs(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class LiteralPat extends @literal_pat, Pat {
+    override string toString() { result = "LiteralPat" }
+
+    /**
+     * Gets the literal of this literal pat, if it exists.
+     */
+    Literal getLiteral() { literal_pat_literals(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class LoopExpr extends @loop_expr, Expr {
+    override string toString() { result = "LoopExpr" }
+
+    /**
+     * Gets the `index`th attr of this loop expression (0-based).
+     */
+    Attr getAttr(int index) { loop_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the label of this loop expression, if it exists.
+     */
+    Label getLabel() { loop_expr_labels(this, result) }
+
+    /**
+     * Gets the loop body of this loop expression, if it exists.
+     */
+    BlockExpr getLoopBody() { loop_expr_loop_bodies(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class MacroExpr extends @macro_expr, Expr {
+    override string toString() { result = "MacroExpr" }
+
+    /**
+     * Gets the macro call of this macro expression, if it exists.
+     */
+    MacroCall getMacroCall() { macro_expr_macro_calls(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class MacroPat extends @macro_pat, Pat {
+    override string toString() { result = "MacroPat" }
+
+    /**
+     * Gets the macro call of this macro pat, if it exists.
+     */
+    MacroCall getMacroCall() { macro_pat_macro_calls(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class MacroType extends @macro_type, Type {
+    override string toString() { result = "MacroType" }
+
+    /**
+     * Gets the macro call of this macro type, if it exists.
+     */
+    MacroCall getMacroCall() { macro_type_macro_calls(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class MatchExpr extends @match_expr, Expr {
+    override string toString() { result = "MatchExpr" }
+
+    /**
+     * Gets the `index`th attr of this match expression (0-based).
+     */
+    Attr getAttr(int index) { match_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this match expression, if it exists.
+     */
+    Expr getExpr() { match_expr_exprs(this, result) }
+
+    /**
+     * Gets the match arm list of this match expression, if it exists.
+     */
+    MatchArmList getMatchArmList() { match_expr_match_arm_lists(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class MethodCallExpr extends @method_call_expr, Expr {
+    override string toString() { result = "MethodCallExpr" }
+
+    /**
+     * Gets the argument list of this method call expression, if it exists.
+     */
+    ArgList getArgList() { method_call_expr_arg_lists(this, result) }
+
+    /**
+     * Gets the `index`th attr of this method call expression (0-based).
+     */
+    Attr getAttr(int index) { method_call_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the generic argument list of this method call expression, if it exists.
+     */
+    GenericArgList getGenericArgList() { method_call_expr_generic_arg_lists(this, result) }
+
+    /**
+     * Gets the name reference of this method call expression, if it exists.
+     */
+    NameRef getNameRef() { method_call_expr_name_refs(this, result) }
+
+    /**
+     * Gets the receiver of this method call expression, if it exists.
+     */
+    Expr getReceiver() { method_call_expr_receivers(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class NeverType extends @never_type, Type {
+    override string toString() { result = "NeverType" }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class OffsetOfExpr extends @offset_of_expr, Expr {
+    override string toString() { result = "OffsetOfExpr" }
+
+    /**
+     * Gets the `index`th attr of this offset of expression (0-based).
+     */
+    Attr getAttr(int index) { offset_of_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the `index`th field of this offset of expression (0-based).
+     */
+    NameRef getField(int index) { offset_of_expr_fields(this, index, result) }
+
+    /**
+     * Gets the ty of this offset of expression, if it exists.
+     */
+    Type getTy() { offset_of_expr_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class OrPat extends @or_pat, Pat {
+    override string toString() { result = "OrPat" }
+
+    /**
+     * Gets the `index`th pat of this or pat (0-based).
+     */
+    Pat getPat(int index) { or_pat_pats(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ParenExpr extends @paren_expr, Expr {
+    override string toString() { result = "ParenExpr" }
+
+    /**
+     * Gets the `index`th attr of this paren expression (0-based).
+     */
+    Attr getAttr(int index) { paren_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this paren expression, if it exists.
+     */
+    Expr getExpr() { paren_expr_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ParenPat extends @paren_pat, Pat {
+    override string toString() { result = "ParenPat" }
+
+    /**
+     * Gets the pat of this paren pat, if it exists.
+     */
+    Pat getPat() { paren_pat_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ParenType extends @paren_type, Type {
+    override string toString() { result = "ParenType" }
+
+    /**
+     * Gets the ty of this paren type, if it exists.
+     */
+    Type getTy() { paren_type_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class PathExpr extends @path_expr, Expr {
+    override string toString() { result = "PathExpr" }
+
+    /**
+     * Gets the `index`th attr of this path expression (0-based).
+     */
+    Attr getAttr(int index) { path_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the path of this path expression, if it exists.
+     */
+    Path getPath() { path_expr_paths(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class PathPat extends @path_pat, Pat {
+    override string toString() { result = "PathPat" }
+
+    /**
+     * Gets the path of this path pat, if it exists.
+     */
+    Path getPath() { path_pat_paths(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class PathType extends @path_type, Type {
+    override string toString() { result = "PathType" }
+
+    /**
+     * Gets the path of this path type, if it exists.
+     */
+    Path getPath() { path_type_paths(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class PrefixExpr extends @prefix_expr, Expr {
+    override string toString() { result = "PrefixExpr" }
+
+    /**
+     * Gets the `index`th attr of this prefix expression (0-based).
+     */
+    Attr getAttr(int index) { prefix_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this prefix expression, if it exists.
+     */
+    Expr getExpr() { prefix_expr_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class PtrType extends @ptr_type, Type {
+    override string toString() { result = "PtrType" }
+
+    /**
+     * Gets the ty of this ptr type, if it exists.
+     */
+    Type getTy() { ptr_type_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class RangeExpr extends @range_expr, Expr {
+    override string toString() { result = "RangeExpr" }
+
+    /**
+     * Gets the `index`th attr of this range expression (0-based).
+     */
+    Attr getAttr(int index) { range_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the end of this range expression, if it exists.
+     */
+    Expr getEnd() { range_expr_ends(this, result) }
+
+    /**
+     * Gets the start of this range expression, if it exists.
+     */
+    Expr getStart() { range_expr_starts(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class RangePat extends @range_pat, Pat {
+    override string toString() { result = "RangePat" }
+
+    /**
+     * Gets the end of this range pat, if it exists.
+     */
+    Pat getEnd() { range_pat_ends(this, result) }
+
+    /**
+     * Gets the start of this range pat, if it exists.
+     */
+    Pat getStart() { range_pat_starts(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class RecordExpr extends @record_expr, Expr {
+    override string toString() { result = "RecordExpr" }
+
+    /**
+     * Gets the path of this record expression, if it exists.
+     */
+    Path getPath() { record_expr_paths(this, result) }
+
+    /**
+     * Gets the record expression field list of this record expression, if it exists.
+     */
+    RecordExprFieldList getRecordExprFieldList() {
+      record_expr_record_expr_field_lists(this, result)
+    }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class RecordFieldList extends @record_field_list, FieldList {
+    override string toString() { result = "RecordFieldList" }
+
+    /**
+     * Gets the `index`th field of this record field list (0-based).
+     */
+    RecordField getField(int index) { record_field_list_fields(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class RecordPat extends @record_pat, Pat {
+    override string toString() { result = "RecordPat" }
+
+    /**
+     * Gets the path of this record pat, if it exists.
+     */
+    Path getPath() { record_pat_paths(this, result) }
+
+    /**
+     * Gets the record pat field list of this record pat, if it exists.
+     */
+    RecordPatFieldList getRecordPatFieldList() { record_pat_record_pat_field_lists(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class RefExpr extends @ref_expr, Expr {
+    override string toString() { result = "RefExpr" }
+
+    /**
+     * Gets the `index`th attr of this reference expression (0-based).
+     */
+    Attr getAttr(int index) { ref_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this reference expression, if it exists.
+     */
+    Expr getExpr() { ref_expr_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class RefPat extends @ref_pat, Pat {
+    override string toString() { result = "RefPat" }
+
+    /**
+     * Gets the pat of this reference pat, if it exists.
+     */
+    Pat getPat() { ref_pat_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class RefType extends @ref_type, Type {
+    override string toString() { result = "RefType" }
+
+    /**
+     * Gets the lifetime of this reference type, if it exists.
+     */
+    Lifetime getLifetime() { ref_type_lifetimes(this, result) }
+
+    /**
+     * Gets the ty of this reference type, if it exists.
+     */
+    Type getTy() { ref_type_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class RestPat extends @rest_pat, Pat {
+    override string toString() { result = "RestPat" }
+
+    /**
+     * Gets the `index`th attr of this rest pat (0-based).
+     */
+    Attr getAttr(int index) { rest_pat_attrs(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ReturnExpr extends @return_expr, Expr {
+    override string toString() { result = "ReturnExpr" }
+
+    /**
+     * Gets the `index`th attr of this return expression (0-based).
+     */
+    Attr getAttr(int index) { return_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this return expression, if it exists.
+     */
+    Expr getExpr() { return_expr_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class SlicePat extends @slice_pat, Pat {
+    override string toString() { result = "SlicePat" }
+
+    /**
+     * Gets the `index`th pat of this slice pat (0-based).
+     */
+    Pat getPat(int index) { slice_pat_pats(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class SliceType extends @slice_type, Type {
+    override string toString() { result = "SliceType" }
+
+    /**
+     * Gets the ty of this slice type, if it exists.
+     */
+    Type getTy() { slice_type_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TryExpr extends @try_expr, Expr {
+    override string toString() { result = "TryExpr" }
+
+    /**
+     * Gets the `index`th attr of this try expression (0-based).
+     */
+    Attr getAttr(int index) { try_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this try expression, if it exists.
+     */
+    Expr getExpr() { try_expr_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TupleExpr extends @tuple_expr, Expr {
+    override string toString() { result = "TupleExpr" }
+
+    /**
+     * Gets the `index`th attr of this tuple expression (0-based).
+     */
+    Attr getAttr(int index) { tuple_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the `index`th field of this tuple expression (0-based).
+     */
+    Expr getField(int index) { tuple_expr_fields(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TupleFieldList extends @tuple_field_list, FieldList {
+    override string toString() { result = "TupleFieldList" }
+
+    /**
+     * Gets the `index`th field of this tuple field list (0-based).
+     */
+    TupleField getField(int index) { tuple_field_list_fields(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TuplePat extends @tuple_pat, Pat {
+    override string toString() { result = "TuplePat" }
+
+    /**
+     * Gets the `index`th field of this tuple pat (0-based).
+     */
+    Pat getField(int index) { tuple_pat_fields(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TupleStructPat extends @tuple_struct_pat, Pat {
+    override string toString() { result = "TupleStructPat" }
+
+    /**
+     * Gets the `index`th field of this tuple struct pat (0-based).
+     */
+    Pat getField(int index) { tuple_struct_pat_fields(this, index, result) }
+
+    /**
+     * Gets the path of this tuple struct pat, if it exists.
+     */
+    Path getPath() { tuple_struct_pat_paths(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TupleType extends @tuple_type, Type {
+    override string toString() { result = "TupleType" }
+
+    /**
+     * Gets the `index`th field of this tuple type (0-based).
+     */
+    Type getField(int index) { tuple_type_fields(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TypeArg extends @type_arg, GenericArg {
+    override string toString() { result = "TypeArg" }
+
+    /**
+     * Gets the ty of this type argument, if it exists.
+     */
+    Type getTy() { type_arg_ties(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TypeParam extends @type_param, GenericParam {
+    override string toString() { result = "TypeParam" }
+
+    /**
+     * Gets the `index`th attr of this type parameter (0-based).
+     */
+    Attr getAttr(int index) { type_param_attrs(this, index, result) }
+
+    /**
+     * Gets the default type of this type parameter, if it exists.
+     */
+    Type getDefaultType() { type_param_default_types(this, result) }
+
+    /**
+     * Gets the name of this type parameter, if it exists.
+     */
+    Name getName() { type_param_names(this, result) }
+
+    /**
+     * Gets the type bound list of this type parameter, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { type_param_type_bound_lists(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class UnderscoreExpr extends @underscore_expr, Expr {
+    override string toString() { result = "UnderscoreExpr" }
+
+    /**
+     * Gets the `index`th attr of this underscore expression (0-based).
+     */
+    Attr getAttr(int index) { underscore_expr_attrs(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class WhileExpr extends @while_expr, Expr {
+    override string toString() { result = "WhileExpr" }
+
+    /**
+     * Gets the `index`th attr of this while expression (0-based).
+     */
+    Attr getAttr(int index) { while_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the condition of this while expression, if it exists.
+     */
+    Expr getCondition() { while_expr_conditions(this, result) }
+
+    /**
+     * Gets the label of this while expression, if it exists.
+     */
+    Label getLabel() { while_expr_labels(this, result) }
+
+    /**
+     * Gets the loop body of this while expression, if it exists.
+     */
+    BlockExpr getLoopBody() { while_expr_loop_bodies(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class WildcardPat extends @wildcard_pat, Pat {
+    override string toString() { result = "WildcardPat" }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class YeetExpr extends @yeet_expr, Expr {
+    override string toString() { result = "YeetExpr" }
+
+    /**
+     * Gets the `index`th attr of this yeet expression (0-based).
+     */
+    Attr getAttr(int index) { yeet_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the expression of this yeet expression, if it exists.
+     */
+    Expr getExpr() { yeet_expr_exprs(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class YieldExpr extends @yield_expr, Expr {
+    override string toString() { result = "YieldExpr" }
 
     /**
-     * Holds if this reference expression is raw.
+     * Gets the `index`th attr of this yield expression (0-based).
      */
-    predicate isRaw() { ref_expr_is_raw(this) }
+    Attr getAttr(int index) { yield_expr_attrs(this, index, result) }
 
     /**
-     * Holds if this reference expression is mut.
+     * Gets the expression of this yield expression, if it exists.
      */
-    predicate isMut() { ref_expr_is_mut(this) }
+    Expr getExpr() { yield_expr_exprs(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A reference pattern. For example:
-   * ```
-   * match x {
-   *     &mut Option::Some(y) => y,
-   *     &Option::None => 0,
-   * };
-   * ```
    */
-  class RefPat extends @ref_pat, Pat {
-    override string toString() { result = "RefPat" }
+  class Const extends @const, AssocItem, Item {
+    override string toString() { result = "Const" }
+
+    /**
+     * Gets the `index`th attr of this const (0-based).
+     */
+    Attr getAttr(int index) { const_attrs(this, index, result) }
+
+    /**
+     * Gets the body of this const, if it exists.
+     */
+    Expr getBody() { const_bodies(this, result) }
+
+    /**
+     * Gets the name of this const, if it exists.
+     */
+    Name getName() { const_names(this, result) }
 
     /**
-     * Gets the pat of this reference pat.
+     * Gets the ty of this const, if it exists.
      */
-    Pat getPat() { ref_pats(this, result) }
+    Type getTy() { const_ties(this, result) }
 
     /**
-     * Holds if this reference pat is mut.
+     * Gets the visibility of this const, if it exists.
      */
-    predicate isMut() { ref_pat_is_mut(this) }
+    Visibility getVisibility() { const_visibilities(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A return expression. For example:
-   * ```
-   * fn some_value() -> i32 {
-   *     return 42;
-   * }
-   * ```
-   * ```
-   * fn no_value() -> () {
-   *     return;
-   * }
-   * ```
    */
-  class ReturnExpr extends @return_expr, Expr {
-    override string toString() { result = "ReturnExpr" }
+  class Enum extends @enum, Adt, Item {
+    override string toString() { result = "Enum" }
 
     /**
-     * Gets the expression of this return expression, if it exists.
+     * Gets the `index`th attr of this enum (0-based).
      */
-    Expr getExpr() { return_expr_exprs(this, result) }
+    Attr getAttr(int index) { enum_attrs(this, index, result) }
+
+    /**
+     * 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) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A slice pattern. For example:
-   * ```
-   * match x {
-   *     [1, 2, 3, 4, 5] => "ok",
-   *     [1, 2, ..] => "fail",
-   *     [x, y, .., z, 7] => "fail",
-   * }
    */
-  class SlicePat extends @slice_pat, Pat {
-    override string toString() { result = "SlicePat" }
+  class ExternBlock extends @extern_block, Item {
+    override string toString() { result = "ExternBlock" }
 
     /**
-     * Gets the `index`th prefix of this slice pat (0-based).
+     * Gets the abi of this extern block, if it exists.
      */
-    Pat getPrefix(int index) { slice_pat_prefixes(this, index, result) }
+    Abi getAbi() { extern_block_abis(this, result) }
 
     /**
-     * Gets the slice of this slice pat, if it exists.
+     * Gets the `index`th attr of this extern block (0-based).
      */
-    Pat getSlice() { slice_pat_slice(this, result) }
+    Attr getAttr(int index) { extern_block_attrs(this, index, result) }
 
     /**
-     * Gets the `index`th suffix of this slice pat (0-based).
+     * Gets the extern item list of this extern block, if it exists.
      */
-    Pat getSuffix(int index) { slice_pat_suffixes(this, index, result) }
+    ExternItemList getExternItemList() { extern_block_extern_item_lists(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A tuple expression. For example:
-   * ```
-   * (1, "one");
-   * (2, "two")[0] = 3;
-   * ```
    */
-  class TupleExpr extends @tuple_expr, Expr {
-    override string toString() { result = "TupleExpr" }
+  class ExternCrate extends @extern_crate, Item {
+    override string toString() { result = "ExternCrate" }
+
+    /**
+     * Gets the `index`th attr of this extern crate (0-based).
+     */
+    Attr getAttr(int index) { extern_crate_attrs(this, index, result) }
+
+    /**
+     * Gets the name reference of this extern crate, if it exists.
+     */
+    NameRef getNameRef() { extern_crate_name_refs(this, result) }
 
     /**
-     * Gets the `index`th expression of this tuple expression (0-based).
+     * Gets the rename of this extern crate, if it exists.
      */
-    Expr getExpr(int index) { tuple_expr_exprs(this, index, result) }
+    Rename getRename() { extern_crate_renames(this, result) }
 
     /**
-     * Holds if this tuple expression is assignee expression.
+     * Gets the visibility of this extern crate, if it exists.
      */
-    predicate isAssigneeExpr() { tuple_expr_is_assignee_expr(this) }
+    Visibility getVisibility() { extern_crate_visibilities(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A tuple pattern. For example:
-   * ```
-   * let (x, y) = (1, 2);
-   * let (a, b, ..,  z) = (1, 2, 3, 4, 5);
-   * ```
    */
-  class TuplePat extends @tuple_pat, Pat {
-    override string toString() { result = "TuplePat" }
+  class Fn extends @fn, AssocItem, ExternItem, Item {
+    override string toString() { result = "Fn" }
+
+    /**
+     * Gets the abi of this fn, if it exists.
+     */
+    Abi getAbi() { fn_abis(this, result) }
+
+    /**
+     * Gets the `index`th attr of this fn (0-based).
+     */
+    Attr getAttr(int index) { fn_attrs(this, index, result) }
+
+    /**
+     * Gets the body of this fn, if it exists.
+     */
+    BlockExpr getBody() { fn_bodies(this, result) }
+
+    /**
+     * Gets the generic parameter list of this fn, if it exists.
+     */
+    GenericParamList getGenericParamList() { fn_generic_param_lists(this, result) }
+
+    /**
+     * Gets the name of this fn, if it exists.
+     */
+    Name getName() { fn_names(this, result) }
+
+    /**
+     * Gets the parameter list of this fn, if it exists.
+     */
+    ParamList getParamList() { fn_param_lists(this, result) }
+
+    /**
+     * Gets the ret type of this fn, if it exists.
+     */
+    RetType getRetType() { fn_ret_types(this, result) }
 
     /**
-     * Gets the `index`th argument of this tuple pat (0-based).
+     * Gets the visibility of this fn, if it exists.
      */
-    Pat getArg(int index) { tuple_pat_args(this, index, result) }
+    Visibility getVisibility() { fn_visibilities(this, result) }
 
     /**
-     * Gets the ellipsis index of this tuple pat, if it exists.
+     * Gets the where clause of this fn, if it exists.
      */
-    int getEllipsisIndex() { tuple_pat_ellipsis_indices(this, result) }
+    WhereClause getWhereClause() { fn_where_clauses(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A tuple struct pattern. For example:
-   * ```
-   * match x {
-   *     Tuple("a", 1, 2, 3) => "great",
-   *     Tuple(.., 3) => "fine",
-   *     Tuple(..) => "fail",
-   * };
-   * ```
    */
-  class TupleStructPat extends @tuple_struct_pat, Pat {
-    override string toString() { result = "TupleStructPat" }
+  class Impl extends @impl, Item {
+    override string toString() { result = "Impl" }
 
     /**
-     * Gets the path of this tuple struct pat, if it exists.
+     * Gets the assoc item list of this impl, if it exists.
      */
-    Path getPath() { tuple_struct_pat_paths(this, result) }
+    AssocItemList getAssocItemList() { impl_assoc_item_lists(this, result) }
+
+    /**
+     * Gets the `index`th attr of this impl (0-based).
+     */
+    Attr getAttr(int index) { impl_attrs(this, index, result) }
+
+    /**
+     * Gets the generic parameter list of this impl, if it exists.
+     */
+    GenericParamList getGenericParamList() { impl_generic_param_lists(this, result) }
+
+    /**
+     * Gets the self ty of this impl, if it exists.
+     */
+    Type getSelfTy() { impl_self_ties(this, result) }
+
+    /**
+     * Gets the trait of this impl, if it exists.
+     */
+    Type getTrait() { impl_traits(this, result) }
 
     /**
-     * Gets the `index`th argument of this tuple struct pat (0-based).
+     * Gets the visibility of this impl, if it exists.
      */
-    Pat getArg(int index) { tuple_struct_pat_args(this, index, result) }
+    Visibility getVisibility() { impl_visibilities(this, result) }
 
     /**
-     * Gets the ellipsis index of this tuple struct pat, if it exists.
+     * Gets the where clause of this impl, if it exists.
      */
-    int getEllipsisIndex() { tuple_struct_pat_ellipsis_indices(this, result) }
+    WhereClause getWhereClause() { impl_where_clauses(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An underscore expression. For example:
-   * ```
-   * _ = 42;
-   * ```
    */
-  class UnderscoreExpr extends @underscore_expr, Expr {
-    override string toString() { result = "UnderscoreExpr" }
+  class MacroCall extends @macro_call, AssocItem, ExternItem, Item {
+    override string toString() { result = "MacroCall" }
+
+    /**
+     * Gets the `index`th attr of this macro call (0-based).
+     */
+    Attr getAttr(int index) { macro_call_attrs(this, index, result) }
+
+    /**
+     * Gets the path of this macro call, if it exists.
+     */
+    Path getPath() { macro_call_paths(this, result) }
+
+    /**
+     * Gets the token tree of this macro call, if it exists.
+     */
+    TokenTree getTokenTree() { macro_call_token_trees(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A declaration that is not yet extracted.
    */
-  class UnimplementedDeclaration extends @unimplemented_declaration, Declaration, Unimplemented {
-    override string toString() { result = "UnimplementedDeclaration" }
+  class MacroDef extends @macro_def, Item {
+    override string toString() { result = "MacroDef" }
+
+    /**
+     * Gets the arguments of this macro def, if it exists.
+     */
+    TokenTree getArgs() { macro_def_args(this, result) }
+
+    /**
+     * Gets the `index`th attr of this macro def (0-based).
+     */
+    Attr getAttr(int index) { macro_def_attrs(this, index, result) }
+
+    /**
+     * Gets the body of this macro def, if it exists.
+     */
+    TokenTree getBody() { macro_def_bodies(this, result) }
+
+    /**
+     * Gets the name of this macro def, if it exists.
+     */
+    Name getName() { macro_def_names(this, result) }
+
+    /**
+     * Gets the visibility of this macro def, if it exists.
+     */
+    Visibility getVisibility() { macro_def_visibilities(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A wildcard pattern. For example:
-   * ```
-   * let _ = 42;
-   * ```
    */
-  class WildcardPat extends @wildcard_pat, Pat {
-    override string toString() { result = "WildcardPat" }
+  class MacroRules extends @macro_rules, Item {
+    override string toString() { result = "MacroRules" }
+
+    /**
+     * Gets the `index`th attr of this macro rules (0-based).
+     */
+    Attr getAttr(int index) { macro_rules_attrs(this, index, result) }
+
+    /**
+     * Gets the name of this macro rules, if it exists.
+     */
+    Name getName() { macro_rules_names(this, result) }
+
+    /**
+     * Gets the token tree of this macro rules, if it exists.
+     */
+    TokenTree getTokenTree() { macro_rules_token_trees(this, result) }
+
+    /**
+     * Gets the visibility of this macro rules, if it exists.
+     */
+    Visibility getVisibility() { macro_rules_visibilities(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A `yeet` expression. For example:
-   * ```
-   * if x < size {
-   *    do yeet "index out of bounds";
-   * }
-   * ```
    */
-  class YeetExpr extends @yeet_expr, Expr {
-    override string toString() { result = "YeetExpr" }
+  class Module extends @module, Item {
+    override string toString() { result = "Module" }
 
     /**
-     * Gets the expression of this yeet expression, if it exists.
+     * Gets the `index`th attr of this module (0-based).
      */
-    Expr getExpr() { yeet_expr_exprs(this, result) }
+    Attr getAttr(int index) { module_attrs(this, index, result) }
+
+    /**
+     * Gets the item list of this module, if it exists.
+     */
+    ItemList getItemList() { module_item_lists(this, result) }
+
+    /**
+     * Gets the name of this module, if it exists.
+     */
+    Name getName() { module_names(this, result) }
+
+    /**
+     * Gets the visibility of this module, if it exists.
+     */
+    Visibility getVisibility() { module_visibilities(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A `yield` expression. For example:
-   * ```
-   * let one = #[coroutine]
-   *     || {
-   *         yield 1;
-   *     };
-   * ```
    */
-  class YieldExpr extends @yield_expr, Expr {
-    override string toString() { result = "YieldExpr" }
+  class Static extends @static, ExternItem, Item {
+    override string toString() { result = "Static" }
 
     /**
-     * Gets the expression of this yield expression, if it exists.
+     * Gets the `index`th attr of this static (0-based).
      */
-    Expr getExpr() { yield_expr_exprs(this, result) }
+    Attr getAttr(int index) { static_attrs(this, index, result) }
+
+    /**
+     * Gets the body of this static, if it exists.
+     */
+    Expr getBody() { static_bodies(this, result) }
+
+    /**
+     * Gets the name of this static, if it exists.
+     */
+    Name getName() { static_names(this, result) }
+
+    /**
+     * Gets the ty of this static, if it exists.
+     */
+    Type getTy() { static_ties(this, result) }
+
+    /**
+     * Gets the visibility of this static, if it exists.
+     */
+    Visibility getVisibility() { static_visibilities(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An async block expression. For example:
-   * ```
-   * async {
-   *    let x = 42;
-   *    x
-   * }.await
-   * ```
    */
-  class AsyncBlockExpr extends @async_block_expr, BlockExprBase {
-    override string toString() { result = "AsyncBlockExpr" }
+  class Struct extends @struct, Adt, Item {
+    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 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) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A block expression. For example:
-   * ```
-   * {
-   *     let x = 42;
-   * }
-   * ```
-   * ```
-   * 'label: {
-   *     let x = 42;
-   *     x
-   * }
-   * ```
    */
-  class BlockExpr extends @block_expr, BlockExprBase {
-    override string toString() { result = "BlockExpr" }
+  class Trait extends @trait, Item {
+    override string toString() { result = "Trait" }
 
     /**
-     * Gets the label of this block expression, if it exists.
+     * Gets the assoc item list of this trait, if it exists.
      */
-    Label getLabel() { block_expr_labels(this, result) }
+    AssocItemList getAssocItemList() { trait_assoc_item_lists(this, result) }
+
+    /**
+     * Gets the `index`th attr of this trait (0-based).
+     */
+    Attr getAttr(int index) { trait_attrs(this, index, result) }
+
+    /**
+     * Gets the generic parameter list of this trait, if it exists.
+     */
+    GenericParamList getGenericParamList() { trait_generic_param_lists(this, result) }
+
+    /**
+     * Gets the name of this trait, if it exists.
+     */
+    Name getName() { trait_names(this, result) }
+
+    /**
+     * Gets the type bound list of this trait, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { trait_type_bound_lists(this, result) }
+
+    /**
+     * Gets the visibility of this trait, if it exists.
+     */
+    Visibility getVisibility() { trait_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this trait, if it exists.
+     */
+    WhereClause getWhereClause() { trait_where_clauses(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TraitAlias extends @trait_alias, Item {
+    override string toString() { result = "TraitAlias" }
+
+    /**
+     * Gets the `index`th attr of this trait alias (0-based).
+     */
+    Attr getAttr(int index) { trait_alias_attrs(this, index, result) }
+
+    /**
+     * Gets the generic parameter list of this trait alias, if it exists.
+     */
+    GenericParamList getGenericParamList() { trait_alias_generic_param_lists(this, result) }
+
+    /**
+     * Gets the name of this trait alias, if it exists.
+     */
+    Name getName() { trait_alias_names(this, result) }
+
+    /**
+     * Gets the type bound list of this trait alias, if it exists.
+     */
+    TypeBoundList getTypeBoundList() { trait_alias_type_bound_lists(this, result) }
+
+    /**
+     * Gets the visibility of this trait alias, if it exists.
+     */
+    Visibility getVisibility() { trait_alias_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this trait alias, if it exists.
+     */
+    WhereClause getWhereClause() { trait_alias_where_clauses(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An element list expression. For example:
-   * ```
-   * [1, 2, 3, 4, 5];
-   * [1, 2, 3, 4, 5][0] = 6;
-   * ```
    */
-  class ElementListExpr extends @element_list_expr, ArrayExpr {
-    override string toString() { result = "ElementListExpr" }
+  class TypeAlias extends @type_alias, AssocItem, ExternItem, Item {
+    override string toString() { result = "TypeAlias" }
+
+    /**
+     * Gets the `index`th attr of this type alias (0-based).
+     */
+    Attr getAttr(int index) { type_alias_attrs(this, index, result) }
+
+    /**
+     * Gets the generic parameter list of this type alias, if it exists.
+     */
+    GenericParamList getGenericParamList() { type_alias_generic_param_lists(this, result) }
+
+    /**
+     * Gets the name of this type alias, if it exists.
+     */
+    Name getName() { type_alias_names(this, result) }
+
+    /**
+     * Gets the ty of this type alias, if it exists.
+     */
+    Type getTy() { type_alias_ties(this, result) }
 
     /**
-     * Gets the `index`th element of this element list expression (0-based).
+     * Gets the type bound list of this type alias, if it exists.
      */
-    Expr getElement(int index) { element_list_expr_elements(this, index, result) }
+    TypeBoundList getTypeBoundList() { type_alias_type_bound_lists(this, result) }
 
     /**
-     * Holds if this element list expression is assignee expression.
+     * Gets the visibility of this type alias, if it exists.
      */
-    predicate isAssigneeExpr() { element_list_expr_is_assignee_expr(this) }
+    Visibility getVisibility() { type_alias_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this type alias, if it exists.
+     */
+    WhereClause getWhereClause() { type_alias_where_clauses(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A repeat expression. For example:
-   * ```
-   * [1; 10];
    */
-  class RepeatExpr extends @repeat_expr, ArrayExpr {
-    override string toString() { result = "RepeatExpr" }
+  class Union extends @union, Adt, Item {
+    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 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 initializer of this repeat expression.
+     * Gets the record field list of this union, if it exists.
      */
-    Expr getInitializer() { repeat_exprs(this, result, _) }
+    RecordFieldList getRecordFieldList() { union_record_field_lists(this, result) }
 
     /**
-     * Gets the repeat of this repeat expression.
+     * Gets the visibility of this union, if it exists.
      */
-    Expr getRepeat() { repeat_exprs(this, _, result) }
+    Visibility getVisibility() { union_visibilities(this, result) }
+
+    /**
+     * Gets the where clause of this union, if it exists.
+     */
+    WhereClause getWhereClause() { union_where_clauses(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * An unsafe block expression. For example:
-   * ```
-   * let layout = unsafe {
-   *     let x = 42;
-   *     Layout::from_size_align_unchecked(size, align)
-   * };
-   * ```
    */
-  class UnsafeBlockExpr extends @unsafe_block_expr, BlockExprBase {
-    override string toString() { result = "UnsafeBlockExpr" }
+  class Use extends @use, Item {
+    override string toString() { result = "Use" }
+
+    /**
+     * Gets the `index`th attr of this use (0-based).
+     */
+    Attr getAttr(int index) { use_attrs(this, index, result) }
+
+    /**
+     * Gets the use tree of this use, if it exists.
+     */
+    UseTree getUseTree() { use_use_trees(this, result) }
+
+    /**
+     * Gets the visibility of this use, if it exists.
+     */
+    Visibility getVisibility() { use_visibilities(this, result) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExpr.qll
index 65da804b1ba98..fdcf3d3ec0911 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExpr.qll
@@ -6,10 +6,9 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.Path
-import codeql.rust.elements.RecordExprField
+import codeql.rust.elements.RecordExprFieldList
 
 /**
  * INTERNAL: This module contains the fully generated definition of `RecordExpr` and should not
@@ -17,13 +16,6 @@ import codeql.rust.elements.RecordExprField
  */
 module Generated {
   /**
-   * A record expression. For example:
-   * ```
-   * let first = Foo { a: 1, b: 2 };
-   * let second = Foo { a: 2, ..first };
-   * Foo { a: 1, b: 2 }[2] = 10;
-   * Foo { .. } = second;
-   * ```
    * INTERNAL: Do not reference the `Generated::RecordExpr` class directly.
    * Use the subclass `RecordExpr`, where the following predicates are available.
    */
@@ -44,48 +36,18 @@ module Generated {
     final predicate hasPath() { exists(this.getPath()) }
 
     /**
-     * Gets the `index`th fld of this record expression (0-based).
+     * Gets the record expression field list of this record expression, if it exists.
      */
-    RecordExprField getFld(int index) {
+    RecordExprFieldList getRecordExprFieldList() {
       result =
-        Synth::convertRecordExprFieldFromRaw(Synth::convertRecordExprToRaw(this)
+        Synth::convertRecordExprFieldListFromRaw(Synth::convertRecordExprToRaw(this)
               .(Raw::RecordExpr)
-              .getFld(index))
+              .getRecordExprFieldList())
     }
 
     /**
-     * Gets any of the flds of this record expression.
+     * Holds if `getRecordExprFieldList()` exists.
      */
-    final RecordExprField getAFld() { result = this.getFld(_) }
-
-    /**
-     * Gets the number of flds of this record expression.
-     */
-    final int getNumberOfFlds() { result = count(int i | exists(this.getFld(i))) }
-
-    /**
-     * Gets the spread of this record expression, if it exists.
-     */
-    Expr getSpread() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertRecordExprToRaw(this).(Raw::RecordExpr).getSpread())
-    }
-
-    /**
-     * Holds if `getSpread()` exists.
-     */
-    final predicate hasSpread() { exists(this.getSpread()) }
-
-    /**
-     * Holds if this record expression has ellipsis.
-     */
-    predicate hasEllipsis() { Synth::convertRecordExprToRaw(this).(Raw::RecordExpr).hasEllipsis() }
-
-    /**
-     * Holds if this record expression is assignee expression.
-     */
-    predicate isAssigneeExpr() {
-      Synth::convertRecordExprToRaw(this).(Raw::RecordExpr).isAssigneeExpr()
-    }
+    final predicate hasRecordExprFieldList() { exists(this.getRecordExprFieldList()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprField.qll
index 8dfd39de745e5..df3750c331ae4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprField.qll
@@ -7,7 +7,9 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.NameRef
 
 /**
  * INTERNAL: This module contains the fully generated definition of `RecordExprField` and should not
@@ -15,10 +17,6 @@ import codeql.rust.elements.Expr
  */
 module Generated {
   /**
-   * A field in a record expression. For example `a: 1` in:
-   * ```
-   * Foo { a: 1, b: 2 };
-   * ```
    * INTERNAL: Do not reference the `Generated::RecordExprField` class directly.
    * Use the subclass `RecordExprField`, where the following predicates are available.
    */
@@ -26,14 +24,27 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RecordExprField" }
 
     /**
-     * Gets the name of this record expression field.
+     * Gets the `index`th attr of this record expression field (0-based).
      */
-    string getName() {
-      result = Synth::convertRecordExprFieldToRaw(this).(Raw::RecordExprField).getName()
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRecordExprFieldToRaw(this)
+              .(Raw::RecordExprField)
+              .getAttr(index))
     }
 
     /**
-     * Gets the expression of this record expression field.
+     * Gets any of the attrs of this record expression field.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this record expression field.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this record expression field, if it exists.
      */
     Expr getExpr() {
       result =
@@ -41,5 +52,25 @@ module Generated {
               .(Raw::RecordExprField)
               .getExpr())
     }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the name reference of this record expression field, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertRecordExprFieldToRaw(this)
+              .(Raw::RecordExprField)
+              .getNameRef())
+    }
+
+    /**
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll
new file mode 100644
index 0000000000000..0453bd681a058
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll
@@ -0,0 +1,81 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RecordExprFieldList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.RecordExprField
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RecordExprFieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::RecordExprFieldList` class directly.
+   * Use the subclass `RecordExprFieldList`, where the following predicates are available.
+   */
+  class RecordExprFieldList extends Synth::TRecordExprFieldList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "RecordExprFieldList" }
+
+    /**
+     * Gets the `index`th attr of this record expression field list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRecordExprFieldListToRaw(this)
+              .(Raw::RecordExprFieldList)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this record expression field list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this record expression field list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th field of this record expression field list (0-based).
+     */
+    RecordExprField getField(int index) {
+      result =
+        Synth::convertRecordExprFieldFromRaw(Synth::convertRecordExprFieldListToRaw(this)
+              .(Raw::RecordExprFieldList)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this record expression field list.
+     */
+    final RecordExprField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this record expression field list.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+
+    /**
+     * Gets the spread of this record expression field list, if it exists.
+     */
+    Expr getSpread() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertRecordExprFieldListToRaw(this)
+              .(Raw::RecordExprFieldList)
+              .getSpread())
+    }
+
+    /**
+     * Holds if `getSpread()` exists.
+     */
+    final predicate hasSpread() { exists(this.getSpread()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
new file mode 100644
index 0000000000000..fb5bd9abc1d01
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
@@ -0,0 +1,88 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RecordField`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RecordField` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::RecordField` class directly.
+   * Use the subclass `RecordField`, where the following predicates are available.
+   */
+  class RecordField extends Synth::TRecordField, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "RecordField" }
+
+    /**
+     * Gets the `index`th attr of this record field (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRecordFieldToRaw(this)
+              .(Raw::RecordField)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this record field.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this record field.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the name of this record field, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertRecordFieldToRaw(this).(Raw::RecordField).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this record field, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertRecordFieldToRaw(this).(Raw::RecordField).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the visibility of this record field, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertRecordFieldToRaw(this)
+              .(Raw::RecordField)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll
new file mode 100644
index 0000000000000..ca90c526958ef
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordFieldList.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RecordFieldList`.
+ * 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.FieldListImpl::Impl as FieldListImpl
+import codeql.rust.elements.RecordField
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RecordFieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::RecordFieldList` class directly.
+   * Use the subclass `RecordFieldList`, where the following predicates are available.
+   */
+  class RecordFieldList extends Synth::TRecordFieldList, FieldListImpl::FieldList {
+    override string getAPrimaryQlClass() { result = "RecordFieldList" }
+
+    /**
+     * Gets the `index`th field of this record field list (0-based).
+     */
+    RecordField getField(int index) {
+      result =
+        Synth::convertRecordFieldFromRaw(Synth::convertRecordFieldListToRaw(this)
+              .(Raw::RecordFieldList)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this record field list.
+     */
+    final RecordField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this record field list.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
index 61c0463f5fccd..f2b45d1d67656 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
@@ -8,7 +8,7 @@ private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
 import codeql.rust.elements.Path
-import codeql.rust.elements.RecordPatField
+import codeql.rust.elements.RecordPatFieldList
 
 /**
  * INTERNAL: This module contains the fully generated definition of `RecordPat` and should not
@@ -16,13 +16,6 @@ import codeql.rust.elements.RecordPatField
  */
 module Generated {
   /**
-   * A record pattern. For example:
-   * ```
-   * match x {
-   *     Foo { a: 1, b: 2 } => "ok",
-   *     Foo { .. } => "fail",
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::RecordPat` class directly.
    * Use the subclass `RecordPat`, where the following predicates are available.
    */
@@ -43,28 +36,18 @@ module Generated {
     final predicate hasPath() { exists(this.getPath()) }
 
     /**
-     * Gets the `index`th fld of this record pat (0-based).
+     * Gets the record pat field list of this record pat, if it exists.
      */
-    RecordPatField getFld(int index) {
+    RecordPatFieldList getRecordPatFieldList() {
       result =
-        Synth::convertRecordPatFieldFromRaw(Synth::convertRecordPatToRaw(this)
+        Synth::convertRecordPatFieldListFromRaw(Synth::convertRecordPatToRaw(this)
               .(Raw::RecordPat)
-              .getFld(index))
+              .getRecordPatFieldList())
     }
 
     /**
-     * Gets any of the flds of this record pat.
+     * Holds if `getRecordPatFieldList()` exists.
      */
-    final RecordPatField getAFld() { result = this.getFld(_) }
-
-    /**
-     * Gets the number of flds of this record pat.
-     */
-    final int getNumberOfFlds() { result = count(int i | exists(this.getFld(i))) }
-
-    /**
-     * Holds if this record pat has ellipsis.
-     */
-    predicate hasEllipsis() { Synth::convertRecordPatToRaw(this).(Raw::RecordPat).hasEllipsis() }
+    final predicate hasRecordPatFieldList() { exists(this.getRecordPatFieldList()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
index fae2356828977..9abe55348543f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
@@ -7,6 +7,8 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.NameRef
 import codeql.rust.elements.Pat
 
 /**
@@ -15,10 +17,6 @@ import codeql.rust.elements.Pat
  */
 module Generated {
   /**
-   * A field in a record pattern. For example `a: 1` in:
-   * ```
-   * let Foo { a: 1, b: 2 } = foo;
-   * ```
    * INTERNAL: Do not reference the `Generated::RecordPatField` class directly.
    * Use the subclass `RecordPatField`, where the following predicates are available.
    */
@@ -26,14 +24,42 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RecordPatField" }
 
     /**
-     * Gets the name of this record pat field.
+     * Gets the `index`th attr of this record pat field (0-based).
      */
-    string getName() {
-      result = Synth::convertRecordPatFieldToRaw(this).(Raw::RecordPatField).getName()
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRecordPatFieldToRaw(this)
+              .(Raw::RecordPatField)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this record pat field.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this record pat field.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the name reference of this record pat field, if it exists.
+     */
+    NameRef getNameRef() {
+      result =
+        Synth::convertNameRefFromRaw(Synth::convertRecordPatFieldToRaw(this)
+              .(Raw::RecordPatField)
+              .getNameRef())
     }
 
     /**
-     * Gets the pat of this record pat field.
+     * Holds if `getNameRef()` exists.
+     */
+    final predicate hasNameRef() { exists(this.getNameRef()) }
+
+    /**
+     * Gets the pat of this record pat field, if it exists.
      */
     Pat getPat() {
       result =
@@ -41,5 +67,10 @@ module Generated {
               .(Raw::RecordPatField)
               .getPat())
     }
+
+    /**
+     * Holds if `getPat()` exists.
+     */
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
new file mode 100644
index 0000000000000..1e7d1ba46bd2d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
@@ -0,0 +1,60 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RecordPatFieldList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.RecordPatField
+import codeql.rust.elements.RestPat
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RecordPatFieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::RecordPatFieldList` class directly.
+   * Use the subclass `RecordPatFieldList`, where the following predicates are available.
+   */
+  class RecordPatFieldList extends Synth::TRecordPatFieldList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "RecordPatFieldList" }
+
+    /**
+     * Gets the `index`th field of this record pat field list (0-based).
+     */
+    RecordPatField getField(int index) {
+      result =
+        Synth::convertRecordPatFieldFromRaw(Synth::convertRecordPatFieldListToRaw(this)
+              .(Raw::RecordPatFieldList)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this record pat field list.
+     */
+    final RecordPatField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this record pat field list.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+
+    /**
+     * Gets the rest pat of this record pat field list, if it exists.
+     */
+    RestPat getRestPat() {
+      result =
+        Synth::convertRestPatFromRaw(Synth::convertRecordPatFieldListToRaw(this)
+              .(Raw::RecordPatFieldList)
+              .getRestPat())
+    }
+
+    /**
+     * Holds if `getRestPat()` exists.
+     */
+    final predicate hasRestPat() { exists(this.getRestPat()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
index 494364d620193..470365a9a00df 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,13 +16,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * A reference expression. For example:
-   * ```
-   *     let ref_const = &foo;
-   *     let ref_mut = &mut foo;
-   *     let raw_const: &mut i32 = &raw const foo;
-   *     let raw_mut: &mut i32 = &raw mut foo;
-   * ```
    * INTERNAL: Do not reference the `Generated::RefExpr` class directly.
    * Use the subclass `RefExpr`, where the following predicates are available.
    */
@@ -29,20 +23,33 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RefExpr" }
 
     /**
-     * Gets the expression of this reference expression.
+     * Gets the `index`th attr of this reference expression (0-based).
      */
-    Expr getExpr() {
-      result = Synth::convertExprFromRaw(Synth::convertRefExprToRaw(this).(Raw::RefExpr).getExpr())
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRefExprToRaw(this).(Raw::RefExpr).getAttr(index))
     }
 
     /**
-     * Holds if this reference expression is raw.
+     * Gets any of the attrs of this reference expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this reference expression.
      */
-    predicate isRaw() { Synth::convertRefExprToRaw(this).(Raw::RefExpr).isRaw() }
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this reference expression, if it exists.
+     */
+    Expr getExpr() {
+      result = Synth::convertExprFromRaw(Synth::convertRefExprToRaw(this).(Raw::RefExpr).getExpr())
+    }
 
     /**
-     * Holds if this reference expression is mut.
+     * Holds if `getExpr()` exists.
      */
-    predicate isMut() { Synth::convertRefExprToRaw(this).(Raw::RefExpr).isMut() }
+    final predicate hasExpr() { exists(this.getExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
index ade9ff606ed11..96c479807edd0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
@@ -15,13 +15,6 @@ import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
  */
 module Generated {
   /**
-   * A reference pattern. For example:
-   * ```
-   * match x {
-   *     &mut Option::Some(y) => y,
-   *     &Option::None => 0,
-   * };
-   * ```
    * INTERNAL: Do not reference the `Generated::RefPat` class directly.
    * Use the subclass `RefPat`, where the following predicates are available.
    */
@@ -29,15 +22,15 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RefPat" }
 
     /**
-     * Gets the pat of this reference pat.
+     * Gets the pat of this reference pat, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertRefPatToRaw(this).(Raw::RefPat).getPat())
     }
 
     /**
-     * Holds if this reference pat is mut.
+     * Holds if `getPat()` exists.
      */
-    predicate isMut() { Synth::convertRefPatToRaw(this).(Raw::RefPat).isMut() }
+    final predicate hasPat() { exists(this.getPat()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll
new file mode 100644
index 0000000000000..5e9150e604956
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll
@@ -0,0 +1,50 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RefType`.
+ * 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.Lifetime
+import codeql.rust.elements.Type
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RefType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::RefType` class directly.
+   * Use the subclass `RefType`, where the following predicates are available.
+   */
+  class RefType extends Synth::TRefType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "RefType" }
+
+    /**
+     * Gets the lifetime of this reference type, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertRefTypeToRaw(this).(Raw::RefType).getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the ty of this reference type, if it exists.
+     */
+    Type getTy() {
+      result = Synth::convertTypeFromRaw(Synth::convertRefTypeToRaw(this).(Raw::RefType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Rename.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Rename.qll
new file mode 100644
index 0000000000000..57d402ad67384
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Rename.qll
@@ -0,0 +1,36 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Rename`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Name
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Rename` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Rename` class directly.
+   * Use the subclass `Rename`, where the following predicates are available.
+   */
+  class Rename extends Synth::TRename, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Rename" }
+
+    /**
+     * Gets the name of this rename, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertRenameToRaw(this).(Raw::Rename).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RepeatExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RepeatExpr.qll
deleted file mode 100644
index 098df1526dbd3..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RepeatExpr.qll
+++ /dev/null
@@ -1,45 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RepeatExpr`.
- * 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.ArrayExprImpl::Impl as ArrayExprImpl
-import codeql.rust.elements.Expr
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RepeatExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A repeat expression. For example:
-   * ```
-   * [1; 10];
-   * INTERNAL: Do not reference the `Generated::RepeatExpr` class directly.
-   * Use the subclass `RepeatExpr`, where the following predicates are available.
-   */
-  class RepeatExpr extends Synth::TRepeatExpr, ArrayExprImpl::ArrayExpr {
-    override string getAPrimaryQlClass() { result = "RepeatExpr" }
-
-    /**
-     * Gets the initializer of this repeat expression.
-     */
-    Expr getInitializer() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertRepeatExprToRaw(this)
-              .(Raw::RepeatExpr)
-              .getInitializer())
-    }
-
-    /**
-     * Gets the repeat of this repeat expression.
-     */
-    Expr getRepeat() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertRepeatExprToRaw(this).(Raw::RepeatExpr).getRepeat())
-    }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
new file mode 100644
index 0000000000000..c2d667c05c937
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
@@ -0,0 +1,42 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RestPat`.
+ * 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.internal.PatImpl::Impl as PatImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RestPat` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::RestPat` class directly.
+   * Use the subclass `RestPat`, where the following predicates are available.
+   */
+  class RestPat extends Synth::TRestPat, PatImpl::Pat {
+    override string getAPrimaryQlClass() { result = "RestPat" }
+
+    /**
+     * Gets the `index`th attr of this rest pat (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertRestPatToRaw(this).(Raw::RestPat).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this rest pat.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this rest pat.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll
new file mode 100644
index 0000000000000..730ffe7b0244a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll
@@ -0,0 +1,36 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RetType`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Type
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RetType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::RetType` class directly.
+   * Use the subclass `RetType`, where the following predicates are available.
+   */
+  class RetType extends Synth::TRetType, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "RetType" }
+
+    /**
+     * Gets the ty of this ret type, if it exists.
+     */
+    Type getTy() {
+      result = Synth::convertTypeFromRaw(Synth::convertRetTypeToRaw(this).(Raw::RetType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll
index 3b5da0ce39afd..6ff6d5e40c7a9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,23 +16,32 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * A return expression. For example:
-   * ```
-   * fn some_value() -> i32 {
-   *     return 42;
-   * }
-   * ```
-   * ```
-   * fn no_value() -> () {
-   *     return;
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::ReturnExpr` class directly.
    * Use the subclass `ReturnExpr`, where the following predicates are available.
    */
   class ReturnExpr extends Synth::TReturnExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "ReturnExpr" }
 
+    /**
+     * Gets the `index`th attr of this return expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertReturnExprToRaw(this)
+              .(Raw::ReturnExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this return expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this return expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the expression of this return expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll
new file mode 100644
index 0000000000000..4251a34054022
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ReturnTypeSyntax`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ReturnTypeSyntax` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ReturnTypeSyntax` class directly.
+   * Use the subclass `ReturnTypeSyntax`, where the following predicates are available.
+   */
+  class ReturnTypeSyntax extends Synth::TReturnTypeSyntax, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ReturnTypeSyntax" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
new file mode 100644
index 0000000000000..44d723a52a0bb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
@@ -0,0 +1,86 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `SelfParam`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `SelfParam` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::SelfParam` class directly.
+   * Use the subclass `SelfParam`, where the following predicates are available.
+   */
+  class SelfParam extends Synth::TSelfParam, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "SelfParam" }
+
+    /**
+     * Gets the `index`th attr of this self parameter (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertSelfParamToRaw(this).(Raw::SelfParam).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this self parameter.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this self parameter.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the lifetime of this self parameter, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertSelfParamToRaw(this)
+              .(Raw::SelfParam)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the name of this self parameter, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertSelfParamToRaw(this).(Raw::SelfParam).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this self parameter, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertSelfParamToRaw(this).(Raw::SelfParam).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
index 29c2d9908d396..e6705076c373d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
@@ -15,13 +15,6 @@ import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
  */
 module Generated {
   /**
-   * A slice pattern. For example:
-   * ```
-   * match x {
-   *     [1, 2, 3, 4, 5] => "ok",
-   *     [1, 2, ..] => "fail",
-   *     [x, y, .., z, 7] => "fail",
-   * }
    * INTERNAL: Do not reference the `Generated::SlicePat` class directly.
    * Use the subclass `SlicePat`, where the following predicates are available.
    */
@@ -29,52 +22,21 @@ module Generated {
     override string getAPrimaryQlClass() { result = "SlicePat" }
 
     /**
-     * Gets the `index`th prefix of this slice pat (0-based).
+     * Gets the `index`th pat of this slice pat (0-based).
      */
-    Pat getPrefix(int index) {
+    Pat getPat(int index) {
       result =
-        Synth::convertPatFromRaw(Synth::convertSlicePatToRaw(this).(Raw::SlicePat).getPrefix(index))
+        Synth::convertPatFromRaw(Synth::convertSlicePatToRaw(this).(Raw::SlicePat).getPat(index))
     }
 
     /**
-     * Gets any of the prefixes of this slice pat.
+     * Gets any of the pats of this slice pat.
      */
-    final Pat getAPrefix() { result = this.getPrefix(_) }
+    final Pat getAPat() { result = this.getPat(_) }
 
     /**
-     * Gets the number of prefixes of this slice pat.
+     * Gets the number of pats of this slice pat.
      */
-    final int getNumberOfPrefixes() { result = count(int i | exists(this.getPrefix(i))) }
-
-    /**
-     * Gets the slice of this slice pat, if it exists.
-     */
-    Pat getSlice() {
-      result =
-        Synth::convertPatFromRaw(Synth::convertSlicePatToRaw(this).(Raw::SlicePat).getSlice())
-    }
-
-    /**
-     * Holds if `getSlice()` exists.
-     */
-    final predicate hasSlice() { exists(this.getSlice()) }
-
-    /**
-     * Gets the `index`th suffix of this slice pat (0-based).
-     */
-    Pat getSuffix(int index) {
-      result =
-        Synth::convertPatFromRaw(Synth::convertSlicePatToRaw(this).(Raw::SlicePat).getSuffix(index))
-    }
-
-    /**
-     * Gets any of the suffixes of this slice pat.
-     */
-    final Pat getASuffix() { result = this.getSuffix(_) }
-
-    /**
-     * Gets the number of suffixes of this slice pat.
-     */
-    final int getNumberOfSuffixes() { result = count(int i | exists(this.getSuffix(i))) }
+    final int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll
new file mode 100644
index 0000000000000..0dd5cdc57c6ca
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll
@@ -0,0 +1,37 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `SliceType`.
+ * 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.Type
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `SliceType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::SliceType` class directly.
+   * Use the subclass `SliceType`, where the following predicates are available.
+   */
+  class SliceType extends Synth::TSliceType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "SliceType" }
+
+    /**
+     * Gets the ty of this slice type, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertSliceTypeToRaw(this).(Raw::SliceType).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SourceFile.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SourceFile.qll
new file mode 100644
index 0000000000000..dfeb843637ae8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SourceFile.qll
@@ -0,0 +1,65 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `SourceFile`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Item
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `SourceFile` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::SourceFile` class directly.
+   * Use the subclass `SourceFile`, where the following predicates are available.
+   */
+  class SourceFile extends Synth::TSourceFile, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "SourceFile" }
+
+    /**
+     * Gets the `index`th attr of this source file (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertSourceFileToRaw(this)
+              .(Raw::SourceFile)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this source file.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this source file.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th item of this source file (0-based).
+     */
+    Item getItem(int index) {
+      result =
+        Synth::convertItemFromRaw(Synth::convertSourceFileToRaw(this)
+              .(Raw::SourceFile)
+              .getItem(index))
+    }
+
+    /**
+     * Gets any of the items of this source file.
+     */
+    final Item getAnItem() { result = this.getItem(_) }
+
+    /**
+     * Gets the number of items of this source file.
+     */
+    final int getNumberOfItems() { result = count(int i | exists(this.getItem(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
new file mode 100644
index 0000000000000..15bd5a10eda1f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
@@ -0,0 +1,98 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Static`.
+ * 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.Expr
+import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Static` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Static` class directly.
+   * Use the subclass `Static`, where the following predicates are available.
+   */
+  class Static extends Synth::TStatic, ExternItemImpl::ExternItem, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Static" }
+
+    /**
+     * Gets the `index`th attr of this static (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this static.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this static.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the body of this static, if it exists.
+     */
+    Expr getBody() {
+      result = Synth::convertExprFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getBody())
+    }
+
+    /**
+     * Holds if `getBody()` exists.
+     */
+    final predicate hasBody() { exists(this.getBody()) }
+
+    /**
+     * Gets the name of this static, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this static, if it exists.
+     */
+    Type getTy() {
+      result = Synth::convertTypeFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the visibility of this static, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertStaticToRaw(this)
+              .(Raw::Static)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Stmt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Stmt.qll
index 55f06bb567a69..a43f2e7f0b8d3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Stmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Stmt.qll
@@ -14,7 +14,6 @@ import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
  */
 module Generated {
   /**
-   * The base class for statements.
    * INTERNAL: Do not reference the `Generated::Stmt` class directly.
    * Use the subclass `Stmt`, where the following predicates are available.
    */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll
new file mode 100644
index 0000000000000..e59ce7eed73d9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll
@@ -0,0 +1,77 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `StmtList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Stmt
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `StmtList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::StmtList` class directly.
+   * Use the subclass `StmtList`, where the following predicates are available.
+   */
+  class StmtList extends Synth::TStmtList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "StmtList" }
+
+    /**
+     * Gets the `index`th attr of this statement list (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertStmtListToRaw(this).(Raw::StmtList).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this statement list.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this statement list.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th statement of this statement list (0-based).
+     */
+    Stmt getStatement(int index) {
+      result =
+        Synth::convertStmtFromRaw(Synth::convertStmtListToRaw(this)
+              .(Raw::StmtList)
+              .getStatement(index))
+    }
+
+    /**
+     * Gets any of the statements of this statement list.
+     */
+    final Stmt getAStatement() { result = this.getStatement(_) }
+
+    /**
+     * Gets the number of statements of this statement list.
+     */
+    final int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
+
+    /**
+     * Gets the tail expression of this statement list, if it exists.
+     */
+    Expr getTailExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertStmtListToRaw(this).(Raw::StmtList).getTailExpr())
+    }
+
+    /**
+     * Holds if `getTailExpr()` exists.
+     */
+    final predicate hasTailExpr() { exists(this.getTailExpr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
new file mode 100644
index 0000000000000..947e8fdf21cbd
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Struct.qll
@@ -0,0 +1,118 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Struct`.
+ * 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.AdtImpl::Impl as AdtImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Struct` and should not
+ * be referenced directly.
+ */
+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, ItemImpl::Item {
+    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.
+     */
+    FieldList getFieldList() {
+      result =
+        Synth::convertFieldListFromRaw(Synth::convertStructToRaw(this).(Raw::Struct).getFieldList())
+    }
+
+    /**
+     * 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 6396fdefffc65..43738836808e0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -15,6 +15,22 @@ module Synth {
    */
   cached
   newtype TElement =
+    /**
+     * INTERNAL: Do not use.
+     */
+    TAbi(Raw::Abi id) { constructAbi(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TArgList(Raw::ArgList id) { constructArgList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TArrayExpr(Raw::ArrayExpr id) { constructArrayExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TArrayType(Raw::ArrayType id) { constructArrayType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -22,7 +38,15 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TAsyncBlockExpr(Raw::AsyncBlockExpr id) { constructAsyncBlockExpr(id) } or
+    TAssocItemList(Raw::AssocItemList id) { constructAssocItemList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TAssocTypeArg(Raw::AssocTypeArg id) { constructAssocTypeArg(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TAttr(Raw::Attr id) { constructAttr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -39,10 +63,6 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TBlockExpr(Raw::BlockExpr id) { constructBlockExpr(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TBoxExpr(Raw::BoxExpr id) { constructBoxExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -59,10 +79,22 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TCastExpr(Raw::CastExpr id) { constructCastExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TClosureBinder(Raw::ClosureBinder id) { constructClosureBinder(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TClosureExpr(Raw::ClosureExpr id) { constructClosureExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TConst(Raw::Const id) { constructConst(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TConstArg(Raw::ConstArg id) { constructConstArg(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -70,7 +102,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TConstExpr(Raw::ConstExpr id) { constructConstExpr(id) } or
+    TConstParam(Raw::ConstParam id) { constructConstParam(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -78,11 +110,27 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TElementListExpr(Raw::ElementListExpr id) { constructElementListExpr(id) } or
+    TDynTraitType(Raw::DynTraitType id) { constructDynTraitType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TEnum(Raw::Enum id) { constructEnum(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TExprStmt(Raw::ExprStmt id) { constructExprStmt(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TExternBlock(Raw::ExternBlock id) { constructExternBlock(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TExternCrate(Raw::ExternCrate id) { constructExternCrate(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TExternItemList(Raw::ExternItemList id) { constructExternItemList(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -90,11 +138,35 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TFunction(Raw::Function id) { constructFunction(id) } or
+    TFn(Raw::Fn id) { constructFn(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TFnPtrType(Raw::FnPtrType id) { constructFnPtrType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TForExpr(Raw::ForExpr id) { constructForExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TForType(Raw::ForType id) { constructForType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TFormatArgsArg(Raw::FormatArgsArg id) { constructFormatArgsArg(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TFormatArgsExpr(Raw::FormatArgsExpr id) { constructFormatArgsExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TGenericArgList(Raw::GenericArgList id) { constructGenericArgList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TGenericParamList(Raw::GenericParamList id) { constructGenericParamList(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -103,6 +175,14 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TIfExpr(Raw::IfExpr id) { constructIfExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TImpl(Raw::Impl id) { constructImpl(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TImplTraitType(Raw::ImplTraitType id) { constructImplTraitType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -110,11 +190,19 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TItemStmt(Raw::ItemStmt id) { constructItemStmt(id) } or
+    TInferType(Raw::InferType id) { constructInferType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TItemList(Raw::ItemList id) { constructItemList(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TLabel(Raw::Label id) { constructLabel(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TLetElse(Raw::LetElse id) { constructLetElse(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -126,7 +214,19 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TLiteralExpr(Raw::LiteralExpr id) { constructLiteralExpr(id) } or
+    TLifetime(Raw::Lifetime id) { constructLifetime(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TLifetimeArg(Raw::LifetimeArg id) { constructLifetimeArg(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TLifetimeParam(Raw::LifetimeParam id) { constructLifetimeParam(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TLiteral(Raw::Literal id) { constructLiteral(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -135,10 +235,46 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TLoopExpr(Raw::LoopExpr id) { constructLoopExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroCall(Raw::MacroCall id) { constructMacroCall(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroDef(Raw::MacroDef id) { constructMacroDef(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroExpr(Raw::MacroExpr id) { constructMacroExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroItems(Raw::MacroItems id) { constructMacroItems(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroPat(Raw::MacroPat id) { constructMacroPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroRules(Raw::MacroRules id) { constructMacroRules(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroStmts(Raw::MacroStmts id) { constructMacroStmts(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMacroType(Raw::MacroType id) { constructMacroType(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TMatchArm(Raw::MatchArm id) { constructMatchArm(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMatchArmList(Raw::MatchArmList id) { constructMatchArmList(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -146,19 +282,35 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TMethodCallExpr(Raw::MethodCallExpr id) { constructMethodCallExpr(id) } or
+    TMatchGuard(Raw::MatchGuard id) { constructMatchGuard(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TMeta(Raw::Meta id) { constructMeta(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TMissingExpr(Raw::MissingExpr id) { constructMissingExpr(id) } or
+    TMethodCallExpr(Raw::MethodCallExpr id) { constructMethodCallExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TMissingPat(Raw::MissingPat id) { constructMissingPat(id) } or
+    TMissing(Raw::Missing id) { constructMissing(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TModule(Raw::Module id) { constructModule(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TName(Raw::Name id) { constructName(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TNameRef(Raw::NameRef id) { constructNameRef(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TNeverType(Raw::NeverType id) { constructNeverType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -167,6 +319,26 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TOrPat(Raw::OrPat id) { constructOrPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TParam(Raw::Param id) { constructParam(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TParamList(Raw::ParamList id) { constructParamList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TParenExpr(Raw::ParenExpr id) { constructParenExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TParenPat(Raw::ParenPat id) { constructParenPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TParenType(Raw::ParenType id) { constructParenType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -179,10 +351,22 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TPathPat(Raw::PathPat id) { constructPathPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TPathSegment(Raw::PathSegment id) { constructPathSegment(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TPathType(Raw::PathType id) { constructPathType(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TPrefixExpr(Raw::PrefixExpr id) { constructPrefixExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TPtrType(Raw::PtrType id) { constructPtrType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -199,6 +383,18 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TRecordExprField(Raw::RecordExprField id) { constructRecordExprField(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRecordExprFieldList(Raw::RecordExprFieldList id) { constructRecordExprFieldList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRecordField(Raw::RecordField id) { constructRecordField(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRecordFieldList(Raw::RecordFieldList id) { constructRecordFieldList(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -207,6 +403,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TRecordPatField(Raw::RecordPatField id) { constructRecordPatField(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRecordPatFieldList(Raw::RecordPatFieldList id) { constructRecordPatFieldList(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -218,19 +418,83 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TRepeatExpr(Raw::RepeatExpr id) { constructRepeatExpr(id) } or
+    TRefType(Raw::RefType id) { constructRefType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRename(Raw::Rename id) { constructRename(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRestPat(Raw::RestPat id) { constructRestPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRetType(Raw::RetType id) { constructRetType(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TReturnExpr(Raw::ReturnExpr id) { constructReturnExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TReturnTypeSyntax(Raw::ReturnTypeSyntax id) { constructReturnTypeSyntax(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TSelfParam(Raw::SelfParam id) { constructSelfParam(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TSlicePat(Raw::SlicePat id) { constructSlicePat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TSliceType(Raw::SliceType id) { constructSliceType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TSourceFile(Raw::SourceFile id) { constructSourceFile(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TStatic(Raw::Static id) { constructStatic(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TStmtList(Raw::StmtList id) { constructStmtList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TStruct(Raw::Struct id) { constructStruct(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTokenTree(Raw::TokenTree id) { constructTokenTree(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTrait(Raw::Trait id) { constructTrait(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTraitAlias(Raw::TraitAlias id) { constructTraitAlias(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTryExpr(Raw::TryExpr id) { constructTryExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
     TTupleExpr(Raw::TupleExpr id) { constructTupleExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTupleField(Raw::TupleField id) { constructTupleField(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTupleFieldList(Raw::TupleFieldList id) { constructTupleFieldList(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -242,7 +506,27 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TTypeRef(Raw::TypeRef id) { constructTypeRef(id) } or
+    TTupleType(Raw::TupleType id) { constructTupleType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTypeAlias(Raw::TypeAlias id) { constructTypeAlias(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTypeArg(Raw::TypeArg id) { constructTypeArg(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTypeBound(Raw::TypeBound id) { constructTypeBound(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTypeBoundList(Raw::TypeBoundList id) { constructTypeBoundList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TTypeParam(Raw::TypeParam id) { constructTypeParam(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -250,13 +534,47 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TUnimplementedDeclaration(Raw::UnimplementedDeclaration id) {
-      constructUnimplementedDeclaration(id)
-    } or
+    TUnimplemented(Raw::Unimplemented id) { constructUnimplemented(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TUnion(Raw::Union id) { constructUnion(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TUnsafeBlockExpr(Raw::UnsafeBlockExpr id) { constructUnsafeBlockExpr(id) } or
+    TUse(Raw::Use id) { constructUse(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TUseTree(Raw::UseTree id) { constructUseTree(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TUseTreeList(Raw::UseTreeList id) { constructUseTreeList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TVariant(Raw::Variant id) { constructVariant(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TVariantList(Raw::VariantList id) { constructVariantList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TVisibility(Raw::Visibility id) { constructVisibility(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TWhereClause(Raw::WhereClause id) { constructWhereClause(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TWherePred(Raw::WherePred id) { constructWherePred(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TWhileExpr(Raw::WhileExpr id) { constructWhileExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -273,68 +591,125 @@ module Synth {
   /**
    * INTERNAL: Do not use.
    */
-  class TArrayExpr = TElementListExpr or TRepeatExpr;
+  class TAdt = TEnum or TStruct or TUnion;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TAstNode =
-    TDeclaration or TExpr or TGenericArgList or TLabel or TMatchArm or TPat or TPath or
-        TRecordExprField or TRecordPatField or TStmt or TTypeRef;
+  class TAssocItem = TConst or TFn or TMacroCall or TTypeAlias;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TBlockExprBase = TAsyncBlockExpr or TBlockExpr or TUnsafeBlockExpr;
+  class TAstNode =
+    TAbi or TAdt or TArgList or TAssocItem or TAssocItemList or TAttr or TClosureBinder or TExpr or
+        TExternItem or TExternItemList or TFieldList or TFormatArgsArg or TGenericArg or
+        TGenericArgList or TGenericParam or TGenericParamList or TItemList or TLabel or TLetElse or
+        TLifetime or TMacroItems or TMacroStmts or TMatchArm or TMatchArmList or TMatchGuard or
+        TMeta or TName or TNameRef or TParam or TParamList or TPat or TPath or TPathSegment or
+        TRecordExprField or TRecordExprFieldList or TRecordField or TRecordPatField or
+        TRecordPatFieldList or TRename or TRetType or TReturnTypeSyntax or TSelfParam or
+        TSourceFile or TStmt or TStmtList or TTokenTree or TTupleField or TType or TTypeBound or
+        TTypeBoundList or TUseTree or TUseTreeList or TVariant or TVariantList or TVisibility or
+        TWhereClause or TWherePred;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TDeclaration = TFunction or TModule or TUnimplementedDeclaration;
+  class TExpr =
+    TArrayExpr or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinaryExpr or TBlockExpr or
+        TBreakExpr or TCallExpr or TCastExpr or TClosureExpr or TContinueExpr or TFieldExpr or
+        TForExpr or TFormatArgsExpr or TIfExpr or TIndexExpr or TLetExpr or TLiteral or TLoopExpr or
+        TMacroExpr or TMatchExpr or TMethodCallExpr or TOffsetOfExpr or TParenExpr or TPathExpr or
+        TPrefixExpr or TRangeExpr or TRecordExpr or TRefExpr or TReturnExpr or TTryExpr or
+        TTupleExpr or TUnderscoreExpr or TWhileExpr or TYeetExpr or TYieldExpr;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TExpr =
-    TArrayExpr or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinaryExpr or TBlockExprBase or
-        TBoxExpr or TBreakExpr or TCallExpr or TCastExpr or TClosureExpr or TConstExpr or
-        TContinueExpr or TFieldExpr or TIfExpr or TIndexExpr or TLetExpr or TLiteralExpr or
-        TLoopExpr or TMatchExpr or TMethodCallExpr or TMissingExpr or TOffsetOfExpr or TPathExpr or
-        TPrefixExpr or TRangeExpr or TRecordExpr or TRefExpr or TReturnExpr or TTupleExpr or
-        TUnderscoreExpr or TYeetExpr or TYieldExpr;
+  class TExternItem = TFn or TMacroCall or TStatic or TTypeAlias;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TLocatable = TAstNode;
+  class TFieldList = TRecordFieldList or TTupleFieldList;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TMissing = TMissingExpr or TMissingPat;
+  class TGenericArg = TAssocTypeArg or TConstArg or TLifetimeArg or TTypeArg;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TPat =
-    TBoxPat or TConstBlockPat or TIdentPat or TLiteralPat or TMissingPat or TOrPat or TPathPat or
-        TRangePat or TRecordPat or TRefPat or TSlicePat or TTuplePat or TTupleStructPat or
-        TWildcardPat;
+  class TGenericParam = TConstParam or TLifetimeParam or TTypeParam;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TStmt = TExprStmt or TItemStmt or TLetStmt;
+  class TItem =
+    TConst or TEnum or TExternBlock or TExternCrate or TFn or TImpl or TMacroCall or TMacroDef or
+        TMacroRules or TModule or TStatic or TStruct or TTrait or TTraitAlias or TTypeAlias or
+        TUnion or TUse;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TUnextracted = TMissing or TUnimplemented;
+  class TLocatable = TAstNode;
 
   /**
    * INTERNAL: Do not use.
    */
-  class TUnimplemented = TGenericArgList or TPath or TTypeRef or TUnimplementedDeclaration;
+  class TPat =
+    TBoxPat or TConstBlockPat or TIdentPat or TLiteralPat or TMacroPat or TOrPat or TParenPat or
+        TPathPat or TRangePat or TRecordPat or TRefPat or TRestPat or TSlicePat or TTuplePat or
+        TTupleStructPat or TWildcardPat;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TStmt = TExprStmt or TItem or TLetStmt;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TType =
+    TArrayType or TDynTraitType or TFnPtrType or TForType or TImplTraitType or TInferType or
+        TMacroType or TNeverType or TParenType or TPathType or TPtrType or TRefType or TSliceType or
+        TTupleType;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TUnextracted = TMissing or TUnimplemented;
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TAbi`, if possible.
+   */
+  cached
+  TAbi convertAbiFromRaw(Raw::Element e) { result = TAbi(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TArgList`, if possible.
+   */
+  cached
+  TArgList convertArgListFromRaw(Raw::Element e) { result = TArgList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TArrayExpr`, if possible.
+   */
+  cached
+  TArrayExpr convertArrayExprFromRaw(Raw::Element e) { result = TArrayExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TArrayType`, if possible.
+   */
+  cached
+  TArrayType convertArrayTypeFromRaw(Raw::Element e) { result = TArrayType(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -345,10 +720,24 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TAsyncBlockExpr`, if possible.
+   * Converts a raw element to a synthesized `TAssocItemList`, if possible.
+   */
+  cached
+  TAssocItemList convertAssocItemListFromRaw(Raw::Element e) { result = TAssocItemList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TAssocTypeArg`, if possible.
+   */
+  cached
+  TAssocTypeArg convertAssocTypeArgFromRaw(Raw::Element e) { result = TAssocTypeArg(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TAttr`, if possible.
    */
   cached
-  TAsyncBlockExpr convertAsyncBlockExprFromRaw(Raw::Element e) { result = TAsyncBlockExpr(e) }
+  TAttr convertAttrFromRaw(Raw::Element e) { result = TAttr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -378,13 +767,6 @@ module Synth {
   cached
   TBlockExpr convertBlockExprFromRaw(Raw::Element e) { result = TBlockExpr(e) }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TBoxExpr`, if possible.
-   */
-  cached
-  TBoxExpr convertBoxExprFromRaw(Raw::Element e) { result = TBoxExpr(e) }
-
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TBoxPat`, if possible.
@@ -413,6 +795,13 @@ module Synth {
   cached
   TCastExpr convertCastExprFromRaw(Raw::Element e) { result = TCastExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TClosureBinder`, if possible.
+   */
+  cached
+  TClosureBinder convertClosureBinderFromRaw(Raw::Element e) { result = TClosureBinder(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TClosureExpr`, if possible.
@@ -420,6 +809,20 @@ module Synth {
   cached
   TClosureExpr convertClosureExprFromRaw(Raw::Element e) { result = TClosureExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TConst`, if possible.
+   */
+  cached
+  TConst convertConstFromRaw(Raw::Element e) { result = TConst(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TConstArg`, if possible.
+   */
+  cached
+  TConstArg convertConstArgFromRaw(Raw::Element e) { result = TConstArg(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TConstBlockPat`, if possible.
@@ -429,10 +832,10 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TConstExpr`, if possible.
+   * Converts a raw element to a synthesized `TConstParam`, if possible.
    */
   cached
-  TConstExpr convertConstExprFromRaw(Raw::Element e) { result = TConstExpr(e) }
+  TConstParam convertConstParamFromRaw(Raw::Element e) { result = TConstParam(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -443,10 +846,17 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TElementListExpr`, if possible.
+   * Converts a raw element to a synthesized `TDynTraitType`, if possible.
    */
   cached
-  TElementListExpr convertElementListExprFromRaw(Raw::Element e) { result = TElementListExpr(e) }
+  TDynTraitType convertDynTraitTypeFromRaw(Raw::Element e) { result = TDynTraitType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TEnum`, if possible.
+   */
+  cached
+  TEnum convertEnumFromRaw(Raw::Element e) { result = TEnum(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -455,6 +865,27 @@ module Synth {
   cached
   TExprStmt convertExprStmtFromRaw(Raw::Element e) { result = TExprStmt(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TExternBlock`, if possible.
+   */
+  cached
+  TExternBlock convertExternBlockFromRaw(Raw::Element e) { result = TExternBlock(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TExternCrate`, if possible.
+   */
+  cached
+  TExternCrate convertExternCrateFromRaw(Raw::Element e) { result = TExternCrate(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TExternItemList`, if possible.
+   */
+  cached
+  TExternItemList convertExternItemListFromRaw(Raw::Element e) { result = TExternItemList(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TFieldExpr`, if possible.
@@ -464,10 +895,45 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TFunction`, if possible.
+   * Converts a raw element to a synthesized `TFn`, if possible.
+   */
+  cached
+  TFn convertFnFromRaw(Raw::Element e) { result = TFn(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TFnPtrType`, if possible.
+   */
+  cached
+  TFnPtrType convertFnPtrTypeFromRaw(Raw::Element e) { result = TFnPtrType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TForExpr`, if possible.
+   */
+  cached
+  TForExpr convertForExprFromRaw(Raw::Element e) { result = TForExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TForType`, if possible.
+   */
+  cached
+  TForType convertForTypeFromRaw(Raw::Element e) { result = TForType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TFormatArgsArg`, if possible.
    */
   cached
-  TFunction convertFunctionFromRaw(Raw::Element e) { result = TFunction(e) }
+  TFormatArgsArg convertFormatArgsArgFromRaw(Raw::Element e) { result = TFormatArgsArg(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TFormatArgsExpr`, if possible.
+   */
+  cached
+  TFormatArgsExpr convertFormatArgsExprFromRaw(Raw::Element e) { result = TFormatArgsExpr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -476,6 +942,13 @@ module Synth {
   cached
   TGenericArgList convertGenericArgListFromRaw(Raw::Element e) { result = TGenericArgList(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TGenericParamList`, if possible.
+   */
+  cached
+  TGenericParamList convertGenericParamListFromRaw(Raw::Element e) { result = TGenericParamList(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TIdentPat`, if possible.
@@ -490,6 +963,20 @@ module Synth {
   cached
   TIfExpr convertIfExprFromRaw(Raw::Element e) { result = TIfExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TImpl`, if possible.
+   */
+  cached
+  TImpl convertImplFromRaw(Raw::Element e) { result = TImpl(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TImplTraitType`, if possible.
+   */
+  cached
+  TImplTraitType convertImplTraitTypeFromRaw(Raw::Element e) { result = TImplTraitType(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TIndexExpr`, if possible.
@@ -499,10 +986,17 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TItemStmt`, if possible.
+   * Converts a raw element to a synthesized `TInferType`, if possible.
+   */
+  cached
+  TInferType convertInferTypeFromRaw(Raw::Element e) { result = TInferType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TItemList`, if possible.
    */
   cached
-  TItemStmt convertItemStmtFromRaw(Raw::Element e) { result = TItemStmt(e) }
+  TItemList convertItemListFromRaw(Raw::Element e) { result = TItemList(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -511,6 +1005,13 @@ module Synth {
   cached
   TLabel convertLabelFromRaw(Raw::Element e) { result = TLabel(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TLetElse`, if possible.
+   */
+  cached
+  TLetElse convertLetElseFromRaw(Raw::Element e) { result = TLetElse(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TLetExpr`, if possible.
@@ -527,921 +1028,2088 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TLiteralExpr`, if possible.
+   * Converts a raw element to a synthesized `TLifetime`, if possible.
    */
   cached
-  TLiteralExpr convertLiteralExprFromRaw(Raw::Element e) { result = TLiteralExpr(e) }
+  TLifetime convertLifetimeFromRaw(Raw::Element e) { result = TLifetime(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TLiteralPat`, if possible.
+   * Converts a raw element to a synthesized `TLifetimeArg`, if possible.
    */
   cached
-  TLiteralPat convertLiteralPatFromRaw(Raw::Element e) { result = TLiteralPat(e) }
+  TLifetimeArg convertLifetimeArgFromRaw(Raw::Element e) { result = TLifetimeArg(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TLoopExpr`, if possible.
+   * Converts a raw element to a synthesized `TLifetimeParam`, if possible.
    */
   cached
-  TLoopExpr convertLoopExprFromRaw(Raw::Element e) { result = TLoopExpr(e) }
+  TLifetimeParam convertLifetimeParamFromRaw(Raw::Element e) { result = TLifetimeParam(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TMatchArm`, if possible.
+   * Converts a raw element to a synthesized `TLiteral`, if possible.
    */
   cached
-  TMatchArm convertMatchArmFromRaw(Raw::Element e) { result = TMatchArm(e) }
+  TLiteral convertLiteralFromRaw(Raw::Element e) { result = TLiteral(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TMatchExpr`, if possible.
+   * Converts a raw element to a synthesized `TLiteralPat`, if possible.
    */
   cached
-  TMatchExpr convertMatchExprFromRaw(Raw::Element e) { result = TMatchExpr(e) }
+  TLiteralPat convertLiteralPatFromRaw(Raw::Element e) { result = TLiteralPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TMethodCallExpr`, if possible.
+   * Converts a raw element to a synthesized `TLoopExpr`, if possible.
    */
   cached
-  TMethodCallExpr convertMethodCallExprFromRaw(Raw::Element e) { result = TMethodCallExpr(e) }
+  TLoopExpr convertLoopExprFromRaw(Raw::Element e) { result = TLoopExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TMissingExpr`, if possible.
+   * Converts a raw element to a synthesized `TMacroCall`, if possible.
    */
   cached
-  TMissingExpr convertMissingExprFromRaw(Raw::Element e) { result = TMissingExpr(e) }
+  TMacroCall convertMacroCallFromRaw(Raw::Element e) { result = TMacroCall(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TMissingPat`, if possible.
+   * Converts a raw element to a synthesized `TMacroDef`, if possible.
    */
   cached
-  TMissingPat convertMissingPatFromRaw(Raw::Element e) { result = TMissingPat(e) }
+  TMacroDef convertMacroDefFromRaw(Raw::Element e) { result = TMacroDef(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TModule`, if possible.
+   * Converts a raw element to a synthesized `TMacroExpr`, if possible.
    */
   cached
-  TModule convertModuleFromRaw(Raw::Element e) { result = TModule(e) }
+  TMacroExpr convertMacroExprFromRaw(Raw::Element e) { result = TMacroExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TOffsetOfExpr`, if possible.
+   * Converts a raw element to a synthesized `TMacroItems`, if possible.
    */
   cached
-  TOffsetOfExpr convertOffsetOfExprFromRaw(Raw::Element e) { result = TOffsetOfExpr(e) }
+  TMacroItems convertMacroItemsFromRaw(Raw::Element e) { result = TMacroItems(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TOrPat`, if possible.
+   * Converts a raw element to a synthesized `TMacroPat`, if possible.
    */
   cached
-  TOrPat convertOrPatFromRaw(Raw::Element e) { result = TOrPat(e) }
+  TMacroPat convertMacroPatFromRaw(Raw::Element e) { result = TMacroPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TPath`, if possible.
+   * Converts a raw element to a synthesized `TMacroRules`, if possible.
    */
   cached
-  TPath convertPathFromRaw(Raw::Element e) { result = TPath(e) }
+  TMacroRules convertMacroRulesFromRaw(Raw::Element e) { result = TMacroRules(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TPathExpr`, if possible.
+   * Converts a raw element to a synthesized `TMacroStmts`, if possible.
    */
   cached
-  TPathExpr convertPathExprFromRaw(Raw::Element e) { result = TPathExpr(e) }
+  TMacroStmts convertMacroStmtsFromRaw(Raw::Element e) { result = TMacroStmts(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TPathPat`, if possible.
+   * Converts a raw element to a synthesized `TMacroType`, if possible.
    */
   cached
-  TPathPat convertPathPatFromRaw(Raw::Element e) { result = TPathPat(e) }
+  TMacroType convertMacroTypeFromRaw(Raw::Element e) { result = TMacroType(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TPrefixExpr`, if possible.
+   * Converts a raw element to a synthesized `TMatchArm`, if possible.
    */
   cached
-  TPrefixExpr convertPrefixExprFromRaw(Raw::Element e) { result = TPrefixExpr(e) }
+  TMatchArm convertMatchArmFromRaw(Raw::Element e) { result = TMatchArm(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRangeExpr`, if possible.
+   * Converts a raw element to a synthesized `TMatchArmList`, if possible.
    */
   cached
-  TRangeExpr convertRangeExprFromRaw(Raw::Element e) { result = TRangeExpr(e) }
+  TMatchArmList convertMatchArmListFromRaw(Raw::Element e) { result = TMatchArmList(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRangePat`, if possible.
+   * Converts a raw element to a synthesized `TMatchExpr`, if possible.
    */
   cached
-  TRangePat convertRangePatFromRaw(Raw::Element e) { result = TRangePat(e) }
+  TMatchExpr convertMatchExprFromRaw(Raw::Element e) { result = TMatchExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordExpr`, if possible.
+   * Converts a raw element to a synthesized `TMatchGuard`, if possible.
    */
   cached
-  TRecordExpr convertRecordExprFromRaw(Raw::Element e) { result = TRecordExpr(e) }
+  TMatchGuard convertMatchGuardFromRaw(Raw::Element e) { result = TMatchGuard(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordExprField`, if possible.
+   * Converts a raw element to a synthesized `TMeta`, if possible.
    */
   cached
-  TRecordExprField convertRecordExprFieldFromRaw(Raw::Element e) { result = TRecordExprField(e) }
+  TMeta convertMetaFromRaw(Raw::Element e) { result = TMeta(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordPat`, if possible.
+   * Converts a raw element to a synthesized `TMethodCallExpr`, if possible.
    */
   cached
-  TRecordPat convertRecordPatFromRaw(Raw::Element e) { result = TRecordPat(e) }
+  TMethodCallExpr convertMethodCallExprFromRaw(Raw::Element e) { result = TMethodCallExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordPatField`, if possible.
+   * Converts a raw element to a synthesized `TMissing`, if possible.
    */
   cached
-  TRecordPatField convertRecordPatFieldFromRaw(Raw::Element e) { result = TRecordPatField(e) }
+  TMissing convertMissingFromRaw(Raw::Element e) { result = TMissing(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRefExpr`, if possible.
+   * Converts a raw element to a synthesized `TModule`, if possible.
    */
   cached
-  TRefExpr convertRefExprFromRaw(Raw::Element e) { result = TRefExpr(e) }
+  TModule convertModuleFromRaw(Raw::Element e) { result = TModule(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRefPat`, if possible.
+   * Converts a raw element to a synthesized `TName`, if possible.
    */
   cached
-  TRefPat convertRefPatFromRaw(Raw::Element e) { result = TRefPat(e) }
+  TName convertNameFromRaw(Raw::Element e) { result = TName(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRepeatExpr`, if possible.
+   * Converts a raw element to a synthesized `TNameRef`, if possible.
    */
   cached
-  TRepeatExpr convertRepeatExprFromRaw(Raw::Element e) { result = TRepeatExpr(e) }
+  TNameRef convertNameRefFromRaw(Raw::Element e) { result = TNameRef(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TReturnExpr`, if possible.
+   * Converts a raw element to a synthesized `TNeverType`, if possible.
    */
   cached
-  TReturnExpr convertReturnExprFromRaw(Raw::Element e) { result = TReturnExpr(e) }
+  TNeverType convertNeverTypeFromRaw(Raw::Element e) { result = TNeverType(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TSlicePat`, if possible.
+   * Converts a raw element to a synthesized `TOffsetOfExpr`, if possible.
    */
   cached
-  TSlicePat convertSlicePatFromRaw(Raw::Element e) { result = TSlicePat(e) }
+  TOffsetOfExpr convertOffsetOfExprFromRaw(Raw::Element e) { result = TOffsetOfExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TTupleExpr`, if possible.
+   * Converts a raw element to a synthesized `TOrPat`, if possible.
    */
   cached
-  TTupleExpr convertTupleExprFromRaw(Raw::Element e) { result = TTupleExpr(e) }
+  TOrPat convertOrPatFromRaw(Raw::Element e) { result = TOrPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TTuplePat`, if possible.
+   * Converts a raw element to a synthesized `TParam`, if possible.
    */
   cached
-  TTuplePat convertTuplePatFromRaw(Raw::Element e) { result = TTuplePat(e) }
+  TParam convertParamFromRaw(Raw::Element e) { result = TParam(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TTupleStructPat`, if possible.
+   * Converts a raw element to a synthesized `TParamList`, if possible.
    */
   cached
-  TTupleStructPat convertTupleStructPatFromRaw(Raw::Element e) { result = TTupleStructPat(e) }
+  TParamList convertParamListFromRaw(Raw::Element e) { result = TParamList(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TTypeRef`, if possible.
+   * Converts a raw element to a synthesized `TParenExpr`, if possible.
    */
   cached
-  TTypeRef convertTypeRefFromRaw(Raw::Element e) { result = TTypeRef(e) }
+  TParenExpr convertParenExprFromRaw(Raw::Element e) { result = TParenExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TUnderscoreExpr`, if possible.
+   * Converts a raw element to a synthesized `TParenPat`, if possible.
    */
   cached
-  TUnderscoreExpr convertUnderscoreExprFromRaw(Raw::Element e) { result = TUnderscoreExpr(e) }
+  TParenPat convertParenPatFromRaw(Raw::Element e) { result = TParenPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TUnimplementedDeclaration`, if possible.
+   * Converts a raw element to a synthesized `TParenType`, if possible.
    */
   cached
-  TUnimplementedDeclaration convertUnimplementedDeclarationFromRaw(Raw::Element e) {
-    result = TUnimplementedDeclaration(e)
-  }
+  TParenType convertParenTypeFromRaw(Raw::Element e) { result = TParenType(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TUnsafeBlockExpr`, if possible.
+   * Converts a raw element to a synthesized `TPath`, if possible.
    */
   cached
-  TUnsafeBlockExpr convertUnsafeBlockExprFromRaw(Raw::Element e) { result = TUnsafeBlockExpr(e) }
+  TPath convertPathFromRaw(Raw::Element e) { result = TPath(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TWildcardPat`, if possible.
+   * Converts a raw element to a synthesized `TPathExpr`, if possible.
    */
   cached
-  TWildcardPat convertWildcardPatFromRaw(Raw::Element e) { result = TWildcardPat(e) }
+  TPathExpr convertPathExprFromRaw(Raw::Element e) { result = TPathExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TYeetExpr`, if possible.
+   * Converts a raw element to a synthesized `TPathPat`, if possible.
    */
   cached
-  TYeetExpr convertYeetExprFromRaw(Raw::Element e) { result = TYeetExpr(e) }
+  TPathPat convertPathPatFromRaw(Raw::Element e) { result = TPathPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TYieldExpr`, if possible.
+   * Converts a raw element to a synthesized `TPathSegment`, if possible.
    */
   cached
-  TYieldExpr convertYieldExprFromRaw(Raw::Element e) { result = TYieldExpr(e) }
+  TPathSegment convertPathSegmentFromRaw(Raw::Element e) { result = TPathSegment(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TArrayExpr`, if possible.
+   * Converts a raw element to a synthesized `TPathType`, if possible.
    */
   cached
-  TArrayExpr convertArrayExprFromRaw(Raw::Element e) {
-    result = convertElementListExprFromRaw(e)
-    or
-    result = convertRepeatExprFromRaw(e)
-  }
+  TPathType convertPathTypeFromRaw(Raw::Element e) { result = TPathType(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TAstNode`, if possible.
+   * Converts a raw element to a synthesized `TPrefixExpr`, if possible.
    */
   cached
-  TAstNode convertAstNodeFromRaw(Raw::Element e) {
-    result = convertDeclarationFromRaw(e)
-    or
-    result = convertExprFromRaw(e)
-    or
-    result = convertGenericArgListFromRaw(e)
-    or
-    result = convertLabelFromRaw(e)
-    or
-    result = convertMatchArmFromRaw(e)
-    or
-    result = convertPatFromRaw(e)
-    or
-    result = convertPathFromRaw(e)
-    or
-    result = convertRecordExprFieldFromRaw(e)
-    or
-    result = convertRecordPatFieldFromRaw(e)
-    or
-    result = convertStmtFromRaw(e)
-    or
-    result = convertTypeRefFromRaw(e)
-  }
+  TPrefixExpr convertPrefixExprFromRaw(Raw::Element e) { result = TPrefixExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TBlockExprBase`, if possible.
+   * Converts a raw element to a synthesized `TPtrType`, if possible.
    */
   cached
-  TBlockExprBase convertBlockExprBaseFromRaw(Raw::Element e) {
-    result = convertAsyncBlockExprFromRaw(e)
-    or
-    result = convertBlockExprFromRaw(e)
-    or
-    result = convertUnsafeBlockExprFromRaw(e)
-  }
+  TPtrType convertPtrTypeFromRaw(Raw::Element e) { result = TPtrType(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TDeclaration`, if possible.
+   * Converts a raw element to a synthesized `TRangeExpr`, if possible.
    */
   cached
-  TDeclaration convertDeclarationFromRaw(Raw::Element e) {
-    result = convertFunctionFromRaw(e)
-    or
-    result = convertModuleFromRaw(e)
-    or
-    result = convertUnimplementedDeclarationFromRaw(e)
-  }
+  TRangeExpr convertRangeExprFromRaw(Raw::Element e) { result = TRangeExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TElement`, if possible.
+   * Converts a raw element to a synthesized `TRangePat`, if possible.
    */
   cached
-  TElement convertElementFromRaw(Raw::Element e) {
-    result = convertLocatableFromRaw(e)
-    or
-    result = convertUnextractedFromRaw(e)
-  }
+  TRangePat convertRangePatFromRaw(Raw::Element e) { result = TRangePat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TExpr`, if possible.
+   * Converts a raw element to a synthesized `TRecordExpr`, if possible.
    */
   cached
-  TExpr convertExprFromRaw(Raw::Element e) {
-    result = convertArrayExprFromRaw(e)
-    or
-    result = convertAsmExprFromRaw(e)
-    or
-    result = convertAwaitExprFromRaw(e)
-    or
-    result = convertBecomeExprFromRaw(e)
-    or
-    result = convertBinaryExprFromRaw(e)
-    or
-    result = convertBlockExprBaseFromRaw(e)
-    or
-    result = convertBoxExprFromRaw(e)
-    or
-    result = convertBreakExprFromRaw(e)
-    or
-    result = convertCallExprFromRaw(e)
-    or
-    result = convertCastExprFromRaw(e)
-    or
-    result = convertClosureExprFromRaw(e)
-    or
-    result = convertConstExprFromRaw(e)
-    or
-    result = convertContinueExprFromRaw(e)
-    or
-    result = convertFieldExprFromRaw(e)
-    or
-    result = convertIfExprFromRaw(e)
-    or
-    result = convertIndexExprFromRaw(e)
-    or
-    result = convertLetExprFromRaw(e)
-    or
-    result = convertLiteralExprFromRaw(e)
-    or
-    result = convertLoopExprFromRaw(e)
-    or
-    result = convertMatchExprFromRaw(e)
-    or
-    result = convertMethodCallExprFromRaw(e)
-    or
-    result = convertMissingExprFromRaw(e)
-    or
-    result = convertOffsetOfExprFromRaw(e)
-    or
-    result = convertPathExprFromRaw(e)
-    or
-    result = convertPrefixExprFromRaw(e)
-    or
-    result = convertRangeExprFromRaw(e)
-    or
-    result = convertRecordExprFromRaw(e)
-    or
-    result = convertRefExprFromRaw(e)
-    or
-    result = convertReturnExprFromRaw(e)
-    or
-    result = convertTupleExprFromRaw(e)
-    or
-    result = convertUnderscoreExprFromRaw(e)
-    or
-    result = convertYeetExprFromRaw(e)
-    or
-    result = convertYieldExprFromRaw(e)
-  }
+  TRecordExpr convertRecordExprFromRaw(Raw::Element e) { result = TRecordExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TLocatable`, if possible.
+   * Converts a raw element to a synthesized `TRecordExprField`, if possible.
    */
   cached
-  TLocatable convertLocatableFromRaw(Raw::Element e) { result = convertAstNodeFromRaw(e) }
+  TRecordExprField convertRecordExprFieldFromRaw(Raw::Element e) { result = TRecordExprField(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TMissing`, if possible.
+   * Converts a raw element to a synthesized `TRecordExprFieldList`, if possible.
    */
   cached
-  TMissing convertMissingFromRaw(Raw::Element e) {
-    result = convertMissingExprFromRaw(e)
-    or
-    result = convertMissingPatFromRaw(e)
+  TRecordExprFieldList convertRecordExprFieldListFromRaw(Raw::Element e) {
+    result = TRecordExprFieldList(e)
   }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TPat`, if possible.
+   * Converts a raw element to a synthesized `TRecordField`, if possible.
    */
   cached
-  TPat convertPatFromRaw(Raw::Element e) {
-    result = convertBoxPatFromRaw(e)
-    or
-    result = convertConstBlockPatFromRaw(e)
-    or
-    result = convertIdentPatFromRaw(e)
-    or
-    result = convertLiteralPatFromRaw(e)
-    or
-    result = convertMissingPatFromRaw(e)
-    or
-    result = convertOrPatFromRaw(e)
-    or
-    result = convertPathPatFromRaw(e)
-    or
-    result = convertRangePatFromRaw(e)
-    or
-    result = convertRecordPatFromRaw(e)
-    or
-    result = convertRefPatFromRaw(e)
-    or
-    result = convertSlicePatFromRaw(e)
-    or
-    result = convertTuplePatFromRaw(e)
-    or
-    result = convertTupleStructPatFromRaw(e)
-    or
-    result = convertWildcardPatFromRaw(e)
-  }
+  TRecordField convertRecordFieldFromRaw(Raw::Element e) { result = TRecordField(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TStmt`, if possible.
+   * Converts a raw element to a synthesized `TRecordFieldList`, if possible.
    */
   cached
-  TStmt convertStmtFromRaw(Raw::Element e) {
-    result = convertExprStmtFromRaw(e)
-    or
-    result = convertItemStmtFromRaw(e)
-    or
-    result = convertLetStmtFromRaw(e)
-  }
+  TRecordFieldList convertRecordFieldListFromRaw(Raw::Element e) { result = TRecordFieldList(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TUnextracted`, if possible.
+   * Converts a raw element to a synthesized `TRecordPat`, if possible.
    */
   cached
-  TUnextracted convertUnextractedFromRaw(Raw::Element e) {
-    result = convertMissingFromRaw(e)
-    or
-    result = convertUnimplementedFromRaw(e)
-  }
+  TRecordPat convertRecordPatFromRaw(Raw::Element e) { result = TRecordPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TUnimplemented`, if possible.
+   * Converts a raw element to a synthesized `TRecordPatField`, if possible.
    */
   cached
-  TUnimplemented convertUnimplementedFromRaw(Raw::Element e) {
-    result = convertGenericArgListFromRaw(e)
-    or
-    result = convertPathFromRaw(e)
-    or
-    result = convertTypeRefFromRaw(e)
-    or
-    result = convertUnimplementedDeclarationFromRaw(e)
+  TRecordPatField convertRecordPatFieldFromRaw(Raw::Element e) { result = TRecordPatField(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TRecordPatFieldList`, if possible.
+   */
+  cached
+  TRecordPatFieldList convertRecordPatFieldListFromRaw(Raw::Element e) {
+    result = TRecordPatFieldList(e)
   }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TAsmExpr` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TRefExpr`, if possible.
    */
   cached
-  Raw::Element convertAsmExprToRaw(TAsmExpr e) { e = TAsmExpr(result) }
+  TRefExpr convertRefExprFromRaw(Raw::Element e) { result = TRefExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TAsyncBlockExpr` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TRefPat`, if possible.
    */
   cached
-  Raw::Element convertAsyncBlockExprToRaw(TAsyncBlockExpr e) { e = TAsyncBlockExpr(result) }
+  TRefPat convertRefPatFromRaw(Raw::Element e) { result = TRefPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TAwaitExpr` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TRefType`, if possible.
    */
   cached
-  Raw::Element convertAwaitExprToRaw(TAwaitExpr e) { e = TAwaitExpr(result) }
+  TRefType convertRefTypeFromRaw(Raw::Element e) { result = TRefType(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TBecomeExpr` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TRename`, if possible.
    */
   cached
-  Raw::Element convertBecomeExprToRaw(TBecomeExpr e) { e = TBecomeExpr(result) }
+  TRename convertRenameFromRaw(Raw::Element e) { result = TRename(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TBinaryExpr` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TRestPat`, if possible.
    */
   cached
-  Raw::Element convertBinaryExprToRaw(TBinaryExpr e) { e = TBinaryExpr(result) }
+  TRestPat convertRestPatFromRaw(Raw::Element e) { result = TRestPat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TBlockExpr` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TRetType`, if possible.
    */
   cached
-  Raw::Element convertBlockExprToRaw(TBlockExpr e) { e = TBlockExpr(result) }
+  TRetType convertRetTypeFromRaw(Raw::Element e) { result = TRetType(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TBoxExpr` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TReturnExpr`, if possible.
    */
   cached
-  Raw::Element convertBoxExprToRaw(TBoxExpr e) { e = TBoxExpr(result) }
+  TReturnExpr convertReturnExprFromRaw(Raw::Element e) { result = TReturnExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TBoxPat` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TReturnTypeSyntax`, if possible.
    */
   cached
-  Raw::Element convertBoxPatToRaw(TBoxPat e) { e = TBoxPat(result) }
+  TReturnTypeSyntax convertReturnTypeSyntaxFromRaw(Raw::Element e) { result = TReturnTypeSyntax(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TBreakExpr` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TSelfParam`, if possible.
    */
   cached
-  Raw::Element convertBreakExprToRaw(TBreakExpr e) { e = TBreakExpr(result) }
+  TSelfParam convertSelfParamFromRaw(Raw::Element e) { result = TSelfParam(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TCallExpr` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TSlicePat`, if possible.
    */
   cached
-  Raw::Element convertCallExprToRaw(TCallExpr e) { e = TCallExpr(result) }
+  TSlicePat convertSlicePatFromRaw(Raw::Element e) { result = TSlicePat(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TCastExpr` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TSliceType`, if possible.
    */
   cached
-  Raw::Element convertCastExprToRaw(TCastExpr e) { e = TCastExpr(result) }
+  TSliceType convertSliceTypeFromRaw(Raw::Element e) { result = TSliceType(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TClosureExpr` to a raw DB element, if possible.
+   * Converts a raw element to a synthesized `TSourceFile`, if possible.
    */
   cached
-  Raw::Element convertClosureExprToRaw(TClosureExpr e) { e = TClosureExpr(result) }
+  TSourceFile convertSourceFileFromRaw(Raw::Element e) { result = TSourceFile(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TStatic`, if possible.
+   */
+  cached
+  TStatic convertStaticFromRaw(Raw::Element e) { result = TStatic(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TStmtList`, if possible.
+   */
+  cached
+  TStmtList convertStmtListFromRaw(Raw::Element e) { result = TStmtList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TStruct`, if possible.
+   */
+  cached
+  TStruct convertStructFromRaw(Raw::Element e) { result = TStruct(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTokenTree`, if possible.
+   */
+  cached
+  TTokenTree convertTokenTreeFromRaw(Raw::Element e) { result = TTokenTree(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTrait`, if possible.
+   */
+  cached
+  TTrait convertTraitFromRaw(Raw::Element e) { result = TTrait(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTraitAlias`, if possible.
+   */
+  cached
+  TTraitAlias convertTraitAliasFromRaw(Raw::Element e) { result = TTraitAlias(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTryExpr`, if possible.
+   */
+  cached
+  TTryExpr convertTryExprFromRaw(Raw::Element e) { result = TTryExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTupleExpr`, if possible.
+   */
+  cached
+  TTupleExpr convertTupleExprFromRaw(Raw::Element e) { result = TTupleExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTupleField`, if possible.
+   */
+  cached
+  TTupleField convertTupleFieldFromRaw(Raw::Element e) { result = TTupleField(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTupleFieldList`, if possible.
+   */
+  cached
+  TTupleFieldList convertTupleFieldListFromRaw(Raw::Element e) { result = TTupleFieldList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTuplePat`, if possible.
+   */
+  cached
+  TTuplePat convertTuplePatFromRaw(Raw::Element e) { result = TTuplePat(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTupleStructPat`, if possible.
+   */
+  cached
+  TTupleStructPat convertTupleStructPatFromRaw(Raw::Element e) { result = TTupleStructPat(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTupleType`, if possible.
+   */
+  cached
+  TTupleType convertTupleTypeFromRaw(Raw::Element e) { result = TTupleType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTypeAlias`, if possible.
+   */
+  cached
+  TTypeAlias convertTypeAliasFromRaw(Raw::Element e) { result = TTypeAlias(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTypeArg`, if possible.
+   */
+  cached
+  TTypeArg convertTypeArgFromRaw(Raw::Element e) { result = TTypeArg(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTypeBound`, if possible.
+   */
+  cached
+  TTypeBound convertTypeBoundFromRaw(Raw::Element e) { result = TTypeBound(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTypeBoundList`, if possible.
+   */
+  cached
+  TTypeBoundList convertTypeBoundListFromRaw(Raw::Element e) { result = TTypeBoundList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TTypeParam`, if possible.
+   */
+  cached
+  TTypeParam convertTypeParamFromRaw(Raw::Element e) { result = TTypeParam(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TUnderscoreExpr`, if possible.
+   */
+  cached
+  TUnderscoreExpr convertUnderscoreExprFromRaw(Raw::Element e) { result = TUnderscoreExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TUnimplemented`, if possible.
+   */
+  cached
+  TUnimplemented convertUnimplementedFromRaw(Raw::Element e) { result = TUnimplemented(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TUnion`, if possible.
+   */
+  cached
+  TUnion convertUnionFromRaw(Raw::Element e) { result = TUnion(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TUse`, if possible.
+   */
+  cached
+  TUse convertUseFromRaw(Raw::Element e) { result = TUse(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TUseTree`, if possible.
+   */
+  cached
+  TUseTree convertUseTreeFromRaw(Raw::Element e) { result = TUseTree(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TUseTreeList`, if possible.
+   */
+  cached
+  TUseTreeList convertUseTreeListFromRaw(Raw::Element e) { result = TUseTreeList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TVariant`, if possible.
+   */
+  cached
+  TVariant convertVariantFromRaw(Raw::Element e) { result = TVariant(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TVariantList`, if possible.
+   */
+  cached
+  TVariantList convertVariantListFromRaw(Raw::Element e) { result = TVariantList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TVisibility`, if possible.
+   */
+  cached
+  TVisibility convertVisibilityFromRaw(Raw::Element e) { result = TVisibility(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TWhereClause`, if possible.
+   */
+  cached
+  TWhereClause convertWhereClauseFromRaw(Raw::Element e) { result = TWhereClause(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TWherePred`, if possible.
+   */
+  cached
+  TWherePred convertWherePredFromRaw(Raw::Element e) { result = TWherePred(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TWhileExpr`, if possible.
+   */
+  cached
+  TWhileExpr convertWhileExprFromRaw(Raw::Element e) { result = TWhileExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TWildcardPat`, if possible.
+   */
+  cached
+  TWildcardPat convertWildcardPatFromRaw(Raw::Element e) { result = TWildcardPat(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TYeetExpr`, if possible.
+   */
+  cached
+  TYeetExpr convertYeetExprFromRaw(Raw::Element e) { result = TYeetExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TYieldExpr`, if possible.
+   */
+  cached
+  TYieldExpr convertYieldExprFromRaw(Raw::Element e) { result = TYieldExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TAdt`, if possible.
+   */
+  cached
+  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 `TAssocItem`, if possible.
+   */
+  cached
+  TAssocItem convertAssocItemFromRaw(Raw::Element e) {
+    result = convertConstFromRaw(e)
+    or
+    result = convertFnFromRaw(e)
+    or
+    result = convertMacroCallFromRaw(e)
+    or
+    result = convertTypeAliasFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TAstNode`, if possible.
+   */
+  cached
+  TAstNode convertAstNodeFromRaw(Raw::Element e) {
+    result = convertAbiFromRaw(e)
+    or
+    result = convertAdtFromRaw(e)
+    or
+    result = convertArgListFromRaw(e)
+    or
+    result = convertAssocItemFromRaw(e)
+    or
+    result = convertAssocItemListFromRaw(e)
+    or
+    result = convertAttrFromRaw(e)
+    or
+    result = convertClosureBinderFromRaw(e)
+    or
+    result = convertExprFromRaw(e)
+    or
+    result = convertExternItemFromRaw(e)
+    or
+    result = convertExternItemListFromRaw(e)
+    or
+    result = convertFieldListFromRaw(e)
+    or
+    result = convertFormatArgsArgFromRaw(e)
+    or
+    result = convertGenericArgFromRaw(e)
+    or
+    result = convertGenericArgListFromRaw(e)
+    or
+    result = convertGenericParamFromRaw(e)
+    or
+    result = convertGenericParamListFromRaw(e)
+    or
+    result = convertItemListFromRaw(e)
+    or
+    result = convertLabelFromRaw(e)
+    or
+    result = convertLetElseFromRaw(e)
+    or
+    result = convertLifetimeFromRaw(e)
+    or
+    result = convertMacroItemsFromRaw(e)
+    or
+    result = convertMacroStmtsFromRaw(e)
+    or
+    result = convertMatchArmFromRaw(e)
+    or
+    result = convertMatchArmListFromRaw(e)
+    or
+    result = convertMatchGuardFromRaw(e)
+    or
+    result = convertMetaFromRaw(e)
+    or
+    result = convertNameFromRaw(e)
+    or
+    result = convertNameRefFromRaw(e)
+    or
+    result = convertParamFromRaw(e)
+    or
+    result = convertParamListFromRaw(e)
+    or
+    result = convertPatFromRaw(e)
+    or
+    result = convertPathFromRaw(e)
+    or
+    result = convertPathSegmentFromRaw(e)
+    or
+    result = convertRecordExprFieldFromRaw(e)
+    or
+    result = convertRecordExprFieldListFromRaw(e)
+    or
+    result = convertRecordFieldFromRaw(e)
+    or
+    result = convertRecordPatFieldFromRaw(e)
+    or
+    result = convertRecordPatFieldListFromRaw(e)
+    or
+    result = convertRenameFromRaw(e)
+    or
+    result = convertRetTypeFromRaw(e)
+    or
+    result = convertReturnTypeSyntaxFromRaw(e)
+    or
+    result = convertSelfParamFromRaw(e)
+    or
+    result = convertSourceFileFromRaw(e)
+    or
+    result = convertStmtFromRaw(e)
+    or
+    result = convertStmtListFromRaw(e)
+    or
+    result = convertTokenTreeFromRaw(e)
+    or
+    result = convertTupleFieldFromRaw(e)
+    or
+    result = convertTypeFromRaw(e)
+    or
+    result = convertTypeBoundFromRaw(e)
+    or
+    result = convertTypeBoundListFromRaw(e)
+    or
+    result = convertUseTreeFromRaw(e)
+    or
+    result = convertUseTreeListFromRaw(e)
+    or
+    result = convertVariantFromRaw(e)
+    or
+    result = convertVariantListFromRaw(e)
+    or
+    result = convertVisibilityFromRaw(e)
+    or
+    result = convertWhereClauseFromRaw(e)
+    or
+    result = convertWherePredFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TElement`, if possible.
+   */
+  cached
+  TElement convertElementFromRaw(Raw::Element e) {
+    result = convertLocatableFromRaw(e)
+    or
+    result = convertUnextractedFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TExpr`, if possible.
+   */
+  cached
+  TExpr convertExprFromRaw(Raw::Element e) {
+    result = convertArrayExprFromRaw(e)
+    or
+    result = convertAsmExprFromRaw(e)
+    or
+    result = convertAwaitExprFromRaw(e)
+    or
+    result = convertBecomeExprFromRaw(e)
+    or
+    result = convertBinaryExprFromRaw(e)
+    or
+    result = convertBlockExprFromRaw(e)
+    or
+    result = convertBreakExprFromRaw(e)
+    or
+    result = convertCallExprFromRaw(e)
+    or
+    result = convertCastExprFromRaw(e)
+    or
+    result = convertClosureExprFromRaw(e)
+    or
+    result = convertContinueExprFromRaw(e)
+    or
+    result = convertFieldExprFromRaw(e)
+    or
+    result = convertForExprFromRaw(e)
+    or
+    result = convertFormatArgsExprFromRaw(e)
+    or
+    result = convertIfExprFromRaw(e)
+    or
+    result = convertIndexExprFromRaw(e)
+    or
+    result = convertLetExprFromRaw(e)
+    or
+    result = convertLiteralFromRaw(e)
+    or
+    result = convertLoopExprFromRaw(e)
+    or
+    result = convertMacroExprFromRaw(e)
+    or
+    result = convertMatchExprFromRaw(e)
+    or
+    result = convertMethodCallExprFromRaw(e)
+    or
+    result = convertOffsetOfExprFromRaw(e)
+    or
+    result = convertParenExprFromRaw(e)
+    or
+    result = convertPathExprFromRaw(e)
+    or
+    result = convertPrefixExprFromRaw(e)
+    or
+    result = convertRangeExprFromRaw(e)
+    or
+    result = convertRecordExprFromRaw(e)
+    or
+    result = convertRefExprFromRaw(e)
+    or
+    result = convertReturnExprFromRaw(e)
+    or
+    result = convertTryExprFromRaw(e)
+    or
+    result = convertTupleExprFromRaw(e)
+    or
+    result = convertUnderscoreExprFromRaw(e)
+    or
+    result = convertWhileExprFromRaw(e)
+    or
+    result = convertYeetExprFromRaw(e)
+    or
+    result = convertYieldExprFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TExternItem`, if possible.
+   */
+  cached
+  TExternItem convertExternItemFromRaw(Raw::Element e) {
+    result = convertFnFromRaw(e)
+    or
+    result = convertMacroCallFromRaw(e)
+    or
+    result = convertStaticFromRaw(e)
+    or
+    result = convertTypeAliasFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TFieldList`, if possible.
+   */
+  cached
+  TFieldList convertFieldListFromRaw(Raw::Element e) {
+    result = convertRecordFieldListFromRaw(e)
+    or
+    result = convertTupleFieldListFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TGenericArg`, if possible.
+   */
+  cached
+  TGenericArg convertGenericArgFromRaw(Raw::Element e) {
+    result = convertAssocTypeArgFromRaw(e)
+    or
+    result = convertConstArgFromRaw(e)
+    or
+    result = convertLifetimeArgFromRaw(e)
+    or
+    result = convertTypeArgFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TGenericParam`, if possible.
+   */
+  cached
+  TGenericParam convertGenericParamFromRaw(Raw::Element e) {
+    result = convertConstParamFromRaw(e)
+    or
+    result = convertLifetimeParamFromRaw(e)
+    or
+    result = convertTypeParamFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TItem`, if possible.
+   */
+  cached
+  TItem convertItemFromRaw(Raw::Element e) {
+    result = convertConstFromRaw(e)
+    or
+    result = convertEnumFromRaw(e)
+    or
+    result = convertExternBlockFromRaw(e)
+    or
+    result = convertExternCrateFromRaw(e)
+    or
+    result = convertFnFromRaw(e)
+    or
+    result = convertImplFromRaw(e)
+    or
+    result = convertMacroCallFromRaw(e)
+    or
+    result = convertMacroDefFromRaw(e)
+    or
+    result = convertMacroRulesFromRaw(e)
+    or
+    result = convertModuleFromRaw(e)
+    or
+    result = convertStaticFromRaw(e)
+    or
+    result = convertStructFromRaw(e)
+    or
+    result = convertTraitFromRaw(e)
+    or
+    result = convertTraitAliasFromRaw(e)
+    or
+    result = convertTypeAliasFromRaw(e)
+    or
+    result = convertUnionFromRaw(e)
+    or
+    result = convertUseFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TLocatable`, if possible.
+   */
+  cached
+  TLocatable convertLocatableFromRaw(Raw::Element e) { result = convertAstNodeFromRaw(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TPat`, if possible.
+   */
+  cached
+  TPat convertPatFromRaw(Raw::Element e) {
+    result = convertBoxPatFromRaw(e)
+    or
+    result = convertConstBlockPatFromRaw(e)
+    or
+    result = convertIdentPatFromRaw(e)
+    or
+    result = convertLiteralPatFromRaw(e)
+    or
+    result = convertMacroPatFromRaw(e)
+    or
+    result = convertOrPatFromRaw(e)
+    or
+    result = convertParenPatFromRaw(e)
+    or
+    result = convertPathPatFromRaw(e)
+    or
+    result = convertRangePatFromRaw(e)
+    or
+    result = convertRecordPatFromRaw(e)
+    or
+    result = convertRefPatFromRaw(e)
+    or
+    result = convertRestPatFromRaw(e)
+    or
+    result = convertSlicePatFromRaw(e)
+    or
+    result = convertTuplePatFromRaw(e)
+    or
+    result = convertTupleStructPatFromRaw(e)
+    or
+    result = convertWildcardPatFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TStmt`, if possible.
+   */
+  cached
+  TStmt convertStmtFromRaw(Raw::Element e) {
+    result = convertExprStmtFromRaw(e)
+    or
+    result = convertItemFromRaw(e)
+    or
+    result = convertLetStmtFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TType`, if possible.
+   */
+  cached
+  TType convertTypeFromRaw(Raw::Element e) {
+    result = convertArrayTypeFromRaw(e)
+    or
+    result = convertDynTraitTypeFromRaw(e)
+    or
+    result = convertFnPtrTypeFromRaw(e)
+    or
+    result = convertForTypeFromRaw(e)
+    or
+    result = convertImplTraitTypeFromRaw(e)
+    or
+    result = convertInferTypeFromRaw(e)
+    or
+    result = convertMacroTypeFromRaw(e)
+    or
+    result = convertNeverTypeFromRaw(e)
+    or
+    result = convertParenTypeFromRaw(e)
+    or
+    result = convertPathTypeFromRaw(e)
+    or
+    result = convertPtrTypeFromRaw(e)
+    or
+    result = convertRefTypeFromRaw(e)
+    or
+    result = convertSliceTypeFromRaw(e)
+    or
+    result = convertTupleTypeFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TUnextracted`, if possible.
+   */
+  cached
+  TUnextracted convertUnextractedFromRaw(Raw::Element e) {
+    result = convertMissingFromRaw(e)
+    or
+    result = convertUnimplementedFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAbi` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertAbiToRaw(TAbi e) { e = TAbi(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TArgList` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertArgListToRaw(TArgList e) { e = TArgList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TArrayExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertArrayExprToRaw(TArrayExpr e) { e = TArrayExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TArrayType` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertArrayTypeToRaw(TArrayType e) { e = TArrayType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAsmExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertAsmExprToRaw(TAsmExpr e) { e = TAsmExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAssocItemList` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertAssocItemListToRaw(TAssocItemList e) { e = TAssocItemList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAssocTypeArg` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertAssocTypeArgToRaw(TAssocTypeArg e) { e = TAssocTypeArg(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAttr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertAttrToRaw(TAttr e) { e = TAttr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAwaitExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertAwaitExprToRaw(TAwaitExpr e) { e = TAwaitExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TBecomeExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertBecomeExprToRaw(TBecomeExpr e) { e = TBecomeExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TBinaryExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertBinaryExprToRaw(TBinaryExpr e) { e = TBinaryExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TBlockExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertBlockExprToRaw(TBlockExpr e) { e = TBlockExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TBoxPat` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertBoxPatToRaw(TBoxPat e) { e = TBoxPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TBreakExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertBreakExprToRaw(TBreakExpr e) { e = TBreakExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCallExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertCallExprToRaw(TCallExpr e) { e = TCallExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TCastExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertCastExprToRaw(TCastExpr e) { e = TCastExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TClosureBinder` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertClosureBinderToRaw(TClosureBinder e) { e = TClosureBinder(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TClosureExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertClosureExprToRaw(TClosureExpr e) { e = TClosureExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TConst` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertConstToRaw(TConst e) { e = TConst(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TConstArg` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertConstArgToRaw(TConstArg e) { e = TConstArg(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TConstBlockPat` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertConstBlockPatToRaw(TConstBlockPat e) { e = TConstBlockPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TConstParam` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertConstParamToRaw(TConstParam e) { e = TConstParam(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TContinueExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertContinueExprToRaw(TContinueExpr e) { e = TContinueExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TDynTraitType` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertDynTraitTypeToRaw(TDynTraitType e) { e = TDynTraitType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TEnum` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertEnumToRaw(TEnum e) { e = TEnum(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TExprStmt` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertExprStmtToRaw(TExprStmt e) { e = TExprStmt(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TExternBlock` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertExternBlockToRaw(TExternBlock e) { e = TExternBlock(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TExternCrate` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertExternCrateToRaw(TExternCrate e) { e = TExternCrate(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TExternItemList` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertExternItemListToRaw(TExternItemList e) { e = TExternItemList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFieldExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertFieldExprToRaw(TFieldExpr e) { e = TFieldExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFn` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertFnToRaw(TFn e) { e = TFn(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFnPtrType` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertFnPtrTypeToRaw(TFnPtrType e) { e = TFnPtrType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TForExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertForExprToRaw(TForExpr e) { e = TForExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TForType` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertForTypeToRaw(TForType e) { e = TForType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFormatArgsArg` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertFormatArgsArgToRaw(TFormatArgsArg e) { e = TFormatArgsArg(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TFormatArgsExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertFormatArgsExprToRaw(TFormatArgsExpr e) { e = TFormatArgsExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TGenericArgList` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertGenericArgListToRaw(TGenericArgList e) { e = TGenericArgList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TGenericParamList` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertGenericParamListToRaw(TGenericParamList e) { e = TGenericParamList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TIdentPat` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertIdentPatToRaw(TIdentPat e) { e = TIdentPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TIfExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertIfExprToRaw(TIfExpr e) { e = TIfExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TImpl` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertImplToRaw(TImpl e) { e = TImpl(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TImplTraitType` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertImplTraitTypeToRaw(TImplTraitType e) { e = TImplTraitType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TIndexExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertIndexExprToRaw(TIndexExpr e) { e = TIndexExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TInferType` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertInferTypeToRaw(TInferType e) { e = TInferType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TItemList` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertItemListToRaw(TItemList e) { e = TItemList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLabel` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertLabelToRaw(TLabel e) { e = TLabel(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLetElse` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertLetElseToRaw(TLetElse e) { e = TLetElse(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLetExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertLetExprToRaw(TLetExpr e) { e = TLetExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLetStmt` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertLetStmtToRaw(TLetStmt e) { e = TLetStmt(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLifetime` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertLifetimeToRaw(TLifetime e) { e = TLifetime(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLifetimeArg` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertLifetimeArgToRaw(TLifetimeArg e) { e = TLifetimeArg(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLifetimeParam` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertLifetimeParamToRaw(TLifetimeParam e) { e = TLifetimeParam(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLiteral` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertLiteralToRaw(TLiteral e) { e = TLiteral(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLiteralPat` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertLiteralPatToRaw(TLiteralPat e) { e = TLiteralPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLoopExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertLoopExprToRaw(TLoopExpr e) { e = TLoopExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroCall` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMacroCallToRaw(TMacroCall e) { e = TMacroCall(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroDef` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMacroDefToRaw(TMacroDef e) { e = TMacroDef(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMacroExprToRaw(TMacroExpr e) { e = TMacroExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroItems` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMacroItemsToRaw(TMacroItems e) { e = TMacroItems(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroPat` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMacroPatToRaw(TMacroPat e) { e = TMacroPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroRules` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMacroRulesToRaw(TMacroRules e) { e = TMacroRules(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroStmts` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMacroStmtsToRaw(TMacroStmts e) { e = TMacroStmts(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMacroType` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMacroTypeToRaw(TMacroType e) { e = TMacroType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMatchArm` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMatchArmToRaw(TMatchArm e) { e = TMatchArm(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMatchArmList` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMatchArmListToRaw(TMatchArmList e) { e = TMatchArmList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMatchExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMatchExprToRaw(TMatchExpr e) { e = TMatchExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMatchGuard` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMatchGuardToRaw(TMatchGuard e) { e = TMatchGuard(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMeta` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMetaToRaw(TMeta e) { e = TMeta(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMethodCallExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMethodCallExprToRaw(TMethodCallExpr e) { e = TMethodCallExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TMissing` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertMissingToRaw(TMissing e) { e = TMissing(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TModule` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertModuleToRaw(TModule e) { e = TModule(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TName` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertNameToRaw(TName e) { e = TName(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TNameRef` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertNameRefToRaw(TNameRef e) { e = TNameRef(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TNeverType` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertNeverTypeToRaw(TNeverType e) { e = TNeverType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TOffsetOfExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertOffsetOfExprToRaw(TOffsetOfExpr e) { e = TOffsetOfExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TOrPat` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertOrPatToRaw(TOrPat e) { e = TOrPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TParam` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertParamToRaw(TParam e) { e = TParam(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TParamList` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertParamListToRaw(TParamList e) { e = TParamList(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TParenExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertParenExprToRaw(TParenExpr e) { e = TParenExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TParenPat` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertParenPatToRaw(TParenPat e) { e = TParenPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TParenType` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertParenTypeToRaw(TParenType e) { e = TParenType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPath` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertPathToRaw(TPath e) { e = TPath(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPathExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertPathExprToRaw(TPathExpr e) { e = TPathExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPathPat` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertPathPatToRaw(TPathPat e) { e = TPathPat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPathSegment` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertPathSegmentToRaw(TPathSegment e) { e = TPathSegment(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPathType` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertPathTypeToRaw(TPathType e) { e = TPathType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPrefixExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertPrefixExprToRaw(TPrefixExpr e) { e = TPrefixExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TPtrType` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertPtrTypeToRaw(TPtrType e) { e = TPtrType(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRangeExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertRangeExprToRaw(TRangeExpr e) { e = TRangeExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRangePat` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertRangePatToRaw(TRangePat e) { e = TRangePat(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRecordExpr` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertRecordExprToRaw(TRecordExpr e) { e = TRecordExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRecordExprField` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertRecordExprFieldToRaw(TRecordExprField e) { e = TRecordExprField(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TConstBlockPat` to a raw DB element, if possible.
+   * Converts a synthesized `TRecordExprFieldList` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertConstBlockPatToRaw(TConstBlockPat e) { e = TConstBlockPat(result) }
+  Raw::Element convertRecordExprFieldListToRaw(TRecordExprFieldList e) {
+    e = TRecordExprFieldList(result)
+  }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TConstExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TRecordField` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertConstExprToRaw(TConstExpr e) { e = TConstExpr(result) }
+  Raw::Element convertRecordFieldToRaw(TRecordField e) { e = TRecordField(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TContinueExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TRecordFieldList` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertContinueExprToRaw(TContinueExpr e) { e = TContinueExpr(result) }
+  Raw::Element convertRecordFieldListToRaw(TRecordFieldList e) { e = TRecordFieldList(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TElementListExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TRecordPat` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertElementListExprToRaw(TElementListExpr e) { e = TElementListExpr(result) }
+  Raw::Element convertRecordPatToRaw(TRecordPat e) { e = TRecordPat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TExprStmt` to a raw DB element, if possible.
+   * Converts a synthesized `TRecordPatField` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertExprStmtToRaw(TExprStmt e) { e = TExprStmt(result) }
+  Raw::Element convertRecordPatFieldToRaw(TRecordPatField e) { e = TRecordPatField(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TFieldExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TRecordPatFieldList` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertFieldExprToRaw(TFieldExpr e) { e = TFieldExpr(result) }
+  Raw::Element convertRecordPatFieldListToRaw(TRecordPatFieldList e) {
+    e = TRecordPatFieldList(result)
+  }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TFunction` to a raw DB element, if possible.
+   * Converts a synthesized `TRefExpr` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertFunctionToRaw(TFunction e) { e = TFunction(result) }
+  Raw::Element convertRefExprToRaw(TRefExpr e) { e = TRefExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TGenericArgList` to a raw DB element, if possible.
+   * Converts a synthesized `TRefPat` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertGenericArgListToRaw(TGenericArgList e) { e = TGenericArgList(result) }
+  Raw::Element convertRefPatToRaw(TRefPat e) { e = TRefPat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TIdentPat` to a raw DB element, if possible.
+   * Converts a synthesized `TRefType` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertIdentPatToRaw(TIdentPat e) { e = TIdentPat(result) }
+  Raw::Element convertRefTypeToRaw(TRefType e) { e = TRefType(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TIfExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TRename` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertIfExprToRaw(TIfExpr e) { e = TIfExpr(result) }
+  Raw::Element convertRenameToRaw(TRename e) { e = TRename(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TIndexExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TRestPat` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertIndexExprToRaw(TIndexExpr e) { e = TIndexExpr(result) }
+  Raw::Element convertRestPatToRaw(TRestPat e) { e = TRestPat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TItemStmt` to a raw DB element, if possible.
+   * Converts a synthesized `TRetType` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertItemStmtToRaw(TItemStmt e) { e = TItemStmt(result) }
+  Raw::Element convertRetTypeToRaw(TRetType e) { e = TRetType(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TLabel` to a raw DB element, if possible.
+   * Converts a synthesized `TReturnExpr` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertLabelToRaw(TLabel e) { e = TLabel(result) }
+  Raw::Element convertReturnExprToRaw(TReturnExpr e) { e = TReturnExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TLetExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TReturnTypeSyntax` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertLetExprToRaw(TLetExpr e) { e = TLetExpr(result) }
+  Raw::Element convertReturnTypeSyntaxToRaw(TReturnTypeSyntax e) { e = TReturnTypeSyntax(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TLetStmt` to a raw DB element, if possible.
+   * Converts a synthesized `TSelfParam` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertLetStmtToRaw(TLetStmt e) { e = TLetStmt(result) }
+  Raw::Element convertSelfParamToRaw(TSelfParam e) { e = TSelfParam(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TLiteralExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TSlicePat` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertLiteralExprToRaw(TLiteralExpr e) { e = TLiteralExpr(result) }
+  Raw::Element convertSlicePatToRaw(TSlicePat e) { e = TSlicePat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TLiteralPat` to a raw DB element, if possible.
+   * Converts a synthesized `TSliceType` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertLiteralPatToRaw(TLiteralPat e) { e = TLiteralPat(result) }
+  Raw::Element convertSliceTypeToRaw(TSliceType e) { e = TSliceType(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TLoopExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TSourceFile` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertLoopExprToRaw(TLoopExpr e) { e = TLoopExpr(result) }
+  Raw::Element convertSourceFileToRaw(TSourceFile e) { e = TSourceFile(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TMatchArm` to a raw DB element, if possible.
+   * Converts a synthesized `TStatic` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertMatchArmToRaw(TMatchArm e) { e = TMatchArm(result) }
+  Raw::Element convertStaticToRaw(TStatic e) { e = TStatic(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TMatchExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TStmtList` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertMatchExprToRaw(TMatchExpr e) { e = TMatchExpr(result) }
+  Raw::Element convertStmtListToRaw(TStmtList e) { e = TStmtList(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TMethodCallExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TStruct` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertMethodCallExprToRaw(TMethodCallExpr e) { e = TMethodCallExpr(result) }
+  Raw::Element convertStructToRaw(TStruct e) { e = TStruct(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TMissingExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TTokenTree` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertMissingExprToRaw(TMissingExpr e) { e = TMissingExpr(result) }
+  Raw::Element convertTokenTreeToRaw(TTokenTree e) { e = TTokenTree(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TMissingPat` to a raw DB element, if possible.
+   * Converts a synthesized `TTrait` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertMissingPatToRaw(TMissingPat e) { e = TMissingPat(result) }
+  Raw::Element convertTraitToRaw(TTrait e) { e = TTrait(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TModule` to a raw DB element, if possible.
+   * Converts a synthesized `TTraitAlias` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertModuleToRaw(TModule e) { e = TModule(result) }
+  Raw::Element convertTraitAliasToRaw(TTraitAlias e) { e = TTraitAlias(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TOffsetOfExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TTryExpr` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertOffsetOfExprToRaw(TOffsetOfExpr e) { e = TOffsetOfExpr(result) }
+  Raw::Element convertTryExprToRaw(TTryExpr e) { e = TTryExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TOrPat` to a raw DB element, if possible.
+   * Converts a synthesized `TTupleExpr` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertOrPatToRaw(TOrPat e) { e = TOrPat(result) }
+  Raw::Element convertTupleExprToRaw(TTupleExpr e) { e = TTupleExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TPath` to a raw DB element, if possible.
+   * Converts a synthesized `TTupleField` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertPathToRaw(TPath e) { e = TPath(result) }
+  Raw::Element convertTupleFieldToRaw(TTupleField e) { e = TTupleField(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TPathExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TTupleFieldList` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertPathExprToRaw(TPathExpr e) { e = TPathExpr(result) }
+  Raw::Element convertTupleFieldListToRaw(TTupleFieldList e) { e = TTupleFieldList(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TPathPat` to a raw DB element, if possible.
+   * Converts a synthesized `TTuplePat` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertPathPatToRaw(TPathPat e) { e = TPathPat(result) }
+  Raw::Element convertTuplePatToRaw(TTuplePat e) { e = TTuplePat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TPrefixExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TTupleStructPat` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertPrefixExprToRaw(TPrefixExpr e) { e = TPrefixExpr(result) }
+  Raw::Element convertTupleStructPatToRaw(TTupleStructPat e) { e = TTupleStructPat(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRangeExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TTupleType` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertRangeExprToRaw(TRangeExpr e) { e = TRangeExpr(result) }
+  Raw::Element convertTupleTypeToRaw(TTupleType e) { e = TTupleType(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRangePat` to a raw DB element, if possible.
+   * Converts a synthesized `TTypeAlias` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertRangePatToRaw(TRangePat e) { e = TRangePat(result) }
+  Raw::Element convertTypeAliasToRaw(TTypeAlias e) { e = TTypeAlias(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TTypeArg` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertRecordExprToRaw(TRecordExpr e) { e = TRecordExpr(result) }
+  Raw::Element convertTypeArgToRaw(TTypeArg e) { e = TTypeArg(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordExprField` to a raw DB element, if possible.
+   * Converts a synthesized `TTypeBound` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertRecordExprFieldToRaw(TRecordExprField e) { e = TRecordExprField(result) }
+  Raw::Element convertTypeBoundToRaw(TTypeBound e) { e = TTypeBound(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordPat` to a raw DB element, if possible.
+   * Converts a synthesized `TTypeBoundList` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertRecordPatToRaw(TRecordPat e) { e = TRecordPat(result) }
+  Raw::Element convertTypeBoundListToRaw(TTypeBoundList e) { e = TTypeBoundList(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordPatField` to a raw DB element, if possible.
+   * Converts a synthesized `TTypeParam` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertRecordPatFieldToRaw(TRecordPatField e) { e = TRecordPatField(result) }
+  Raw::Element convertTypeParamToRaw(TTypeParam e) { e = TTypeParam(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRefExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TUnderscoreExpr` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertRefExprToRaw(TRefExpr e) { e = TRefExpr(result) }
+  Raw::Element convertUnderscoreExprToRaw(TUnderscoreExpr e) { e = TUnderscoreExpr(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRefPat` to a raw DB element, if possible.
+   * Converts a synthesized `TUnimplemented` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertRefPatToRaw(TRefPat e) { e = TRefPat(result) }
+  Raw::Element convertUnimplementedToRaw(TUnimplemented e) { e = TUnimplemented(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRepeatExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TUnion` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertRepeatExprToRaw(TRepeatExpr e) { e = TRepeatExpr(result) }
+  Raw::Element convertUnionToRaw(TUnion e) { e = TUnion(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TReturnExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TUse` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertReturnExprToRaw(TReturnExpr e) { e = TReturnExpr(result) }
+  Raw::Element convertUseToRaw(TUse e) { e = TUse(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TSlicePat` to a raw DB element, if possible.
+   * Converts a synthesized `TUseTree` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertSlicePatToRaw(TSlicePat e) { e = TSlicePat(result) }
+  Raw::Element convertUseTreeToRaw(TUseTree e) { e = TUseTree(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TTupleExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TUseTreeList` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertTupleExprToRaw(TTupleExpr e) { e = TTupleExpr(result) }
+  Raw::Element convertUseTreeListToRaw(TUseTreeList e) { e = TUseTreeList(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TTuplePat` to a raw DB element, if possible.
+   * Converts a synthesized `TVariant` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertTuplePatToRaw(TTuplePat e) { e = TTuplePat(result) }
+  Raw::Element convertVariantToRaw(TVariant e) { e = TVariant(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TTupleStructPat` to a raw DB element, if possible.
+   * Converts a synthesized `TVariantList` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertTupleStructPatToRaw(TTupleStructPat e) { e = TTupleStructPat(result) }
+  Raw::Element convertVariantListToRaw(TVariantList e) { e = TVariantList(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TTypeRef` to a raw DB element, if possible.
+   * Converts a synthesized `TVisibility` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertTypeRefToRaw(TTypeRef e) { e = TTypeRef(result) }
+  Raw::Element convertVisibilityToRaw(TVisibility e) { e = TVisibility(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TUnderscoreExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TWhereClause` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertUnderscoreExprToRaw(TUnderscoreExpr e) { e = TUnderscoreExpr(result) }
+  Raw::Element convertWhereClauseToRaw(TWhereClause e) { e = TWhereClause(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TUnimplementedDeclaration` to a raw DB element, if possible.
+   * Converts a synthesized `TWherePred` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertUnimplementedDeclarationToRaw(TUnimplementedDeclaration e) {
-    e = TUnimplementedDeclaration(result)
-  }
+  Raw::Element convertWherePredToRaw(TWherePred e) { e = TWherePred(result) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TUnsafeBlockExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TWhileExpr` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertUnsafeBlockExprToRaw(TUnsafeBlockExpr e) { e = TUnsafeBlockExpr(result) }
+  Raw::Element convertWhileExprToRaw(TWhileExpr e) { e = TWhileExpr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -1466,13 +3134,30 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TArrayExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TAdt` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertAdtToRaw(TAdt e) {
+    result = convertEnumToRaw(e)
+    or
+    result = convertStructToRaw(e)
+    or
+    result = convertUnionToRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAssocItem` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertArrayExprToRaw(TArrayExpr e) {
-    result = convertElementListExprToRaw(e)
+  Raw::Element convertAssocItemToRaw(TAssocItem e) {
+    result = convertConstToRaw(e)
+    or
+    result = convertFnToRaw(e)
     or
-    result = convertRepeatExprToRaw(e)
+    result = convertMacroCallToRaw(e)
+    or
+    result = convertTypeAliasToRaw(e)
   }
 
   /**
@@ -1481,53 +3166,119 @@ module Synth {
    */
   cached
   Raw::Element convertAstNodeToRaw(TAstNode e) {
-    result = convertDeclarationToRaw(e)
+    result = convertAbiToRaw(e)
+    or
+    result = convertAdtToRaw(e)
+    or
+    result = convertArgListToRaw(e)
+    or
+    result = convertAssocItemToRaw(e)
+    or
+    result = convertAssocItemListToRaw(e)
+    or
+    result = convertAttrToRaw(e)
+    or
+    result = convertClosureBinderToRaw(e)
     or
     result = convertExprToRaw(e)
     or
+    result = convertExternItemToRaw(e)
+    or
+    result = convertExternItemListToRaw(e)
+    or
+    result = convertFieldListToRaw(e)
+    or
+    result = convertFormatArgsArgToRaw(e)
+    or
+    result = convertGenericArgToRaw(e)
+    or
     result = convertGenericArgListToRaw(e)
     or
+    result = convertGenericParamToRaw(e)
+    or
+    result = convertGenericParamListToRaw(e)
+    or
+    result = convertItemListToRaw(e)
+    or
     result = convertLabelToRaw(e)
     or
+    result = convertLetElseToRaw(e)
+    or
+    result = convertLifetimeToRaw(e)
+    or
+    result = convertMacroItemsToRaw(e)
+    or
+    result = convertMacroStmtsToRaw(e)
+    or
     result = convertMatchArmToRaw(e)
     or
+    result = convertMatchArmListToRaw(e)
+    or
+    result = convertMatchGuardToRaw(e)
+    or
+    result = convertMetaToRaw(e)
+    or
+    result = convertNameToRaw(e)
+    or
+    result = convertNameRefToRaw(e)
+    or
+    result = convertParamToRaw(e)
+    or
+    result = convertParamListToRaw(e)
+    or
     result = convertPatToRaw(e)
     or
     result = convertPathToRaw(e)
     or
+    result = convertPathSegmentToRaw(e)
+    or
     result = convertRecordExprFieldToRaw(e)
     or
+    result = convertRecordExprFieldListToRaw(e)
+    or
+    result = convertRecordFieldToRaw(e)
+    or
     result = convertRecordPatFieldToRaw(e)
     or
+    result = convertRecordPatFieldListToRaw(e)
+    or
+    result = convertRenameToRaw(e)
+    or
+    result = convertRetTypeToRaw(e)
+    or
+    result = convertReturnTypeSyntaxToRaw(e)
+    or
+    result = convertSelfParamToRaw(e)
+    or
+    result = convertSourceFileToRaw(e)
+    or
     result = convertStmtToRaw(e)
     or
-    result = convertTypeRefToRaw(e)
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TBlockExprBase` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertBlockExprBaseToRaw(TBlockExprBase e) {
-    result = convertAsyncBlockExprToRaw(e)
+    result = convertStmtListToRaw(e)
     or
-    result = convertBlockExprToRaw(e)
+    result = convertTokenTreeToRaw(e)
     or
-    result = convertUnsafeBlockExprToRaw(e)
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TDeclaration` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertDeclarationToRaw(TDeclaration e) {
-    result = convertFunctionToRaw(e)
+    result = convertTupleFieldToRaw(e)
     or
-    result = convertModuleToRaw(e)
+    result = convertTypeToRaw(e)
+    or
+    result = convertTypeBoundToRaw(e)
+    or
+    result = convertTypeBoundListToRaw(e)
+    or
+    result = convertUseTreeToRaw(e)
     or
-    result = convertUnimplementedDeclarationToRaw(e)
+    result = convertUseTreeListToRaw(e)
+    or
+    result = convertVariantToRaw(e)
+    or
+    result = convertVariantListToRaw(e)
+    or
+    result = convertVisibilityToRaw(e)
+    or
+    result = convertWhereClauseToRaw(e)
+    or
+    result = convertWherePredToRaw(e)
   }
 
   /**
@@ -1557,9 +3308,7 @@ module Synth {
     or
     result = convertBinaryExprToRaw(e)
     or
-    result = convertBlockExprBaseToRaw(e)
-    or
-    result = convertBoxExprToRaw(e)
+    result = convertBlockExprToRaw(e)
     or
     result = convertBreakExprToRaw(e)
     or
@@ -1569,30 +3318,34 @@ module Synth {
     or
     result = convertClosureExprToRaw(e)
     or
-    result = convertConstExprToRaw(e)
-    or
     result = convertContinueExprToRaw(e)
     or
     result = convertFieldExprToRaw(e)
     or
+    result = convertForExprToRaw(e)
+    or
+    result = convertFormatArgsExprToRaw(e)
+    or
     result = convertIfExprToRaw(e)
     or
     result = convertIndexExprToRaw(e)
     or
     result = convertLetExprToRaw(e)
     or
-    result = convertLiteralExprToRaw(e)
+    result = convertLiteralToRaw(e)
     or
     result = convertLoopExprToRaw(e)
     or
+    result = convertMacroExprToRaw(e)
+    or
     result = convertMatchExprToRaw(e)
     or
     result = convertMethodCallExprToRaw(e)
     or
-    result = convertMissingExprToRaw(e)
-    or
     result = convertOffsetOfExprToRaw(e)
     or
+    result = convertParenExprToRaw(e)
+    or
     result = convertPathExprToRaw(e)
     or
     result = convertPrefixExprToRaw(e)
@@ -1605,10 +3358,14 @@ module Synth {
     or
     result = convertReturnExprToRaw(e)
     or
+    result = convertTryExprToRaw(e)
+    or
     result = convertTupleExprToRaw(e)
     or
     result = convertUnderscoreExprToRaw(e)
     or
+    result = convertWhileExprToRaw(e)
+    or
     result = convertYeetExprToRaw(e)
     or
     result = convertYieldExprToRaw(e)
@@ -1616,22 +3373,106 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TLocatable` to a raw DB element, if possible.
+   * Converts a synthesized `TExternItem` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertLocatableToRaw(TLocatable e) { result = convertAstNodeToRaw(e) }
+  Raw::Element convertExternItemToRaw(TExternItem e) {
+    result = convertFnToRaw(e)
+    or
+    result = convertMacroCallToRaw(e)
+    or
+    result = convertStaticToRaw(e)
+    or
+    result = convertTypeAliasToRaw(e)
+  }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TMissing` to a raw DB element, if possible.
+   * Converts a synthesized `TFieldList` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertFieldListToRaw(TFieldList e) {
+    result = convertRecordFieldListToRaw(e)
+    or
+    result = convertTupleFieldListToRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TGenericArg` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertGenericArgToRaw(TGenericArg e) {
+    result = convertAssocTypeArgToRaw(e)
+    or
+    result = convertConstArgToRaw(e)
+    or
+    result = convertLifetimeArgToRaw(e)
+    or
+    result = convertTypeArgToRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TGenericParam` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertGenericParamToRaw(TGenericParam e) {
+    result = convertConstParamToRaw(e)
+    or
+    result = convertLifetimeParamToRaw(e)
+    or
+    result = convertTypeParamToRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TItem` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertMissingToRaw(TMissing e) {
-    result = convertMissingExprToRaw(e)
+  Raw::Element convertItemToRaw(TItem e) {
+    result = convertConstToRaw(e)
+    or
+    result = convertEnumToRaw(e)
+    or
+    result = convertExternBlockToRaw(e)
     or
-    result = convertMissingPatToRaw(e)
+    result = convertExternCrateToRaw(e)
+    or
+    result = convertFnToRaw(e)
+    or
+    result = convertImplToRaw(e)
+    or
+    result = convertMacroCallToRaw(e)
+    or
+    result = convertMacroDefToRaw(e)
+    or
+    result = convertMacroRulesToRaw(e)
+    or
+    result = convertModuleToRaw(e)
+    or
+    result = convertStaticToRaw(e)
+    or
+    result = convertStructToRaw(e)
+    or
+    result = convertTraitToRaw(e)
+    or
+    result = convertTraitAliasToRaw(e)
+    or
+    result = convertTypeAliasToRaw(e)
+    or
+    result = convertUnionToRaw(e)
+    or
+    result = convertUseToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLocatable` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertLocatableToRaw(TLocatable e) { result = convertAstNodeToRaw(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPat` to a raw DB element, if possible.
@@ -1646,10 +3487,12 @@ module Synth {
     or
     result = convertLiteralPatToRaw(e)
     or
-    result = convertMissingPatToRaw(e)
+    result = convertMacroPatToRaw(e)
     or
     result = convertOrPatToRaw(e)
     or
+    result = convertParenPatToRaw(e)
+    or
     result = convertPathPatToRaw(e)
     or
     result = convertRangePatToRaw(e)
@@ -1658,6 +3501,8 @@ module Synth {
     or
     result = convertRefPatToRaw(e)
     or
+    result = convertRestPatToRaw(e)
+    or
     result = convertSlicePatToRaw(e)
     or
     result = convertTuplePatToRaw(e)
@@ -1675,34 +3520,54 @@ module Synth {
   Raw::Element convertStmtToRaw(TStmt e) {
     result = convertExprStmtToRaw(e)
     or
-    result = convertItemStmtToRaw(e)
+    result = convertItemToRaw(e)
     or
     result = convertLetStmtToRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TUnextracted` to a raw DB element, if possible.
+   * Converts a synthesized `TType` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertUnextractedToRaw(TUnextracted e) {
-    result = convertMissingToRaw(e)
+  Raw::Element convertTypeToRaw(TType e) {
+    result = convertArrayTypeToRaw(e)
     or
-    result = convertUnimplementedToRaw(e)
+    result = convertDynTraitTypeToRaw(e)
+    or
+    result = convertFnPtrTypeToRaw(e)
+    or
+    result = convertForTypeToRaw(e)
+    or
+    result = convertImplTraitTypeToRaw(e)
+    or
+    result = convertInferTypeToRaw(e)
+    or
+    result = convertMacroTypeToRaw(e)
+    or
+    result = convertNeverTypeToRaw(e)
+    or
+    result = convertParenTypeToRaw(e)
+    or
+    result = convertPathTypeToRaw(e)
+    or
+    result = convertPtrTypeToRaw(e)
+    or
+    result = convertRefTypeToRaw(e)
+    or
+    result = convertSliceTypeToRaw(e)
+    or
+    result = convertTupleTypeToRaw(e)
   }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TUnimplemented` to a raw DB element, if possible.
+   * Converts a synthesized `TUnextracted` to a raw DB element, if possible.
    */
   cached
-  Raw::Element convertUnimplementedToRaw(TUnimplemented e) {
-    result = convertGenericArgListToRaw(e)
-    or
-    result = convertPathToRaw(e)
-    or
-    result = convertTypeRefToRaw(e)
+  Raw::Element convertUnextractedToRaw(TUnextracted e) {
+    result = convertMissingToRaw(e)
     or
-    result = convertUnimplementedDeclarationToRaw(e)
+    result = convertUnimplementedToRaw(e)
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
index 1cb18d5ff7f40..c502b212a93b1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
@@ -3,66 +3,146 @@
  * This module exports all modules providing `Element` subclasses.
  */
 
+import codeql.rust.elements.internal.AbiConstructor
+import codeql.rust.elements.internal.ArgListConstructor
+import codeql.rust.elements.internal.ArrayExprConstructor
+import codeql.rust.elements.internal.ArrayTypeConstructor
 import codeql.rust.elements.internal.AsmExprConstructor
-import codeql.rust.elements.internal.AsyncBlockExprConstructor
+import codeql.rust.elements.internal.AssocItemListConstructor
+import codeql.rust.elements.internal.AssocTypeArgConstructor
+import codeql.rust.elements.internal.AttrConstructor
 import codeql.rust.elements.internal.AwaitExprConstructor
 import codeql.rust.elements.internal.BecomeExprConstructor
 import codeql.rust.elements.internal.BinaryExprConstructor
 import codeql.rust.elements.internal.BlockExprConstructor
-import codeql.rust.elements.internal.BoxExprConstructor
 import codeql.rust.elements.internal.BoxPatConstructor
 import codeql.rust.elements.internal.BreakExprConstructor
 import codeql.rust.elements.internal.CallExprConstructor
 import codeql.rust.elements.internal.CastExprConstructor
+import codeql.rust.elements.internal.ClosureBinderConstructor
 import codeql.rust.elements.internal.ClosureExprConstructor
+import codeql.rust.elements.internal.ConstConstructor
+import codeql.rust.elements.internal.ConstArgConstructor
 import codeql.rust.elements.internal.ConstBlockPatConstructor
-import codeql.rust.elements.internal.ConstExprConstructor
+import codeql.rust.elements.internal.ConstParamConstructor
 import codeql.rust.elements.internal.ContinueExprConstructor
-import codeql.rust.elements.internal.ElementListExprConstructor
+import codeql.rust.elements.internal.DynTraitTypeConstructor
+import codeql.rust.elements.internal.EnumConstructor
 import codeql.rust.elements.internal.ExprStmtConstructor
+import codeql.rust.elements.internal.ExternBlockConstructor
+import codeql.rust.elements.internal.ExternCrateConstructor
+import codeql.rust.elements.internal.ExternItemListConstructor
 import codeql.rust.elements.internal.FieldExprConstructor
-import codeql.rust.elements.internal.FunctionConstructor
+import codeql.rust.elements.internal.FnConstructor
+import codeql.rust.elements.internal.FnPtrTypeConstructor
+import codeql.rust.elements.internal.ForExprConstructor
+import codeql.rust.elements.internal.ForTypeConstructor
+import codeql.rust.elements.internal.FormatArgsArgConstructor
+import codeql.rust.elements.internal.FormatArgsExprConstructor
 import codeql.rust.elements.internal.GenericArgListConstructor
+import codeql.rust.elements.internal.GenericParamListConstructor
 import codeql.rust.elements.internal.IdentPatConstructor
 import codeql.rust.elements.internal.IfExprConstructor
+import codeql.rust.elements.internal.ImplConstructor
+import codeql.rust.elements.internal.ImplTraitTypeConstructor
 import codeql.rust.elements.internal.IndexExprConstructor
-import codeql.rust.elements.internal.ItemStmtConstructor
+import codeql.rust.elements.internal.InferTypeConstructor
+import codeql.rust.elements.internal.ItemListConstructor
 import codeql.rust.elements.internal.LabelConstructor
+import codeql.rust.elements.internal.LetElseConstructor
 import codeql.rust.elements.internal.LetExprConstructor
 import codeql.rust.elements.internal.LetStmtConstructor
-import codeql.rust.elements.internal.LiteralExprConstructor
+import codeql.rust.elements.internal.LifetimeConstructor
+import codeql.rust.elements.internal.LifetimeArgConstructor
+import codeql.rust.elements.internal.LifetimeParamConstructor
+import codeql.rust.elements.internal.LiteralConstructor
 import codeql.rust.elements.internal.LiteralPatConstructor
 import codeql.rust.elements.internal.LoopExprConstructor
+import codeql.rust.elements.internal.MacroCallConstructor
+import codeql.rust.elements.internal.MacroDefConstructor
+import codeql.rust.elements.internal.MacroExprConstructor
+import codeql.rust.elements.internal.MacroItemsConstructor
+import codeql.rust.elements.internal.MacroPatConstructor
+import codeql.rust.elements.internal.MacroRulesConstructor
+import codeql.rust.elements.internal.MacroStmtsConstructor
+import codeql.rust.elements.internal.MacroTypeConstructor
 import codeql.rust.elements.internal.MatchArmConstructor
+import codeql.rust.elements.internal.MatchArmListConstructor
 import codeql.rust.elements.internal.MatchExprConstructor
+import codeql.rust.elements.internal.MatchGuardConstructor
+import codeql.rust.elements.internal.MetaConstructor
 import codeql.rust.elements.internal.MethodCallExprConstructor
-import codeql.rust.elements.internal.MissingExprConstructor
-import codeql.rust.elements.internal.MissingPatConstructor
+import codeql.rust.elements.internal.MissingConstructor
 import codeql.rust.elements.internal.ModuleConstructor
+import codeql.rust.elements.internal.NameConstructor
+import codeql.rust.elements.internal.NameRefConstructor
+import codeql.rust.elements.internal.NeverTypeConstructor
 import codeql.rust.elements.internal.OffsetOfExprConstructor
 import codeql.rust.elements.internal.OrPatConstructor
+import codeql.rust.elements.internal.ParamConstructor
+import codeql.rust.elements.internal.ParamListConstructor
+import codeql.rust.elements.internal.ParenExprConstructor
+import codeql.rust.elements.internal.ParenPatConstructor
+import codeql.rust.elements.internal.ParenTypeConstructor
 import codeql.rust.elements.internal.PathConstructor
 import codeql.rust.elements.internal.PathExprConstructor
 import codeql.rust.elements.internal.PathPatConstructor
+import codeql.rust.elements.internal.PathSegmentConstructor
+import codeql.rust.elements.internal.PathTypeConstructor
 import codeql.rust.elements.internal.PrefixExprConstructor
+import codeql.rust.elements.internal.PtrTypeConstructor
 import codeql.rust.elements.internal.RangeExprConstructor
 import codeql.rust.elements.internal.RangePatConstructor
 import codeql.rust.elements.internal.RecordExprConstructor
 import codeql.rust.elements.internal.RecordExprFieldConstructor
+import codeql.rust.elements.internal.RecordExprFieldListConstructor
+import codeql.rust.elements.internal.RecordFieldConstructor
+import codeql.rust.elements.internal.RecordFieldListConstructor
 import codeql.rust.elements.internal.RecordPatConstructor
 import codeql.rust.elements.internal.RecordPatFieldConstructor
+import codeql.rust.elements.internal.RecordPatFieldListConstructor
 import codeql.rust.elements.internal.RefExprConstructor
 import codeql.rust.elements.internal.RefPatConstructor
-import codeql.rust.elements.internal.RepeatExprConstructor
+import codeql.rust.elements.internal.RefTypeConstructor
+import codeql.rust.elements.internal.RenameConstructor
+import codeql.rust.elements.internal.RestPatConstructor
+import codeql.rust.elements.internal.RetTypeConstructor
 import codeql.rust.elements.internal.ReturnExprConstructor
+import codeql.rust.elements.internal.ReturnTypeSyntaxConstructor
+import codeql.rust.elements.internal.SelfParamConstructor
 import codeql.rust.elements.internal.SlicePatConstructor
+import codeql.rust.elements.internal.SliceTypeConstructor
+import codeql.rust.elements.internal.SourceFileConstructor
+import codeql.rust.elements.internal.StaticConstructor
+import codeql.rust.elements.internal.StmtListConstructor
+import codeql.rust.elements.internal.StructConstructor
+import codeql.rust.elements.internal.TokenTreeConstructor
+import codeql.rust.elements.internal.TraitConstructor
+import codeql.rust.elements.internal.TraitAliasConstructor
+import codeql.rust.elements.internal.TryExprConstructor
 import codeql.rust.elements.internal.TupleExprConstructor
+import codeql.rust.elements.internal.TupleFieldConstructor
+import codeql.rust.elements.internal.TupleFieldListConstructor
 import codeql.rust.elements.internal.TuplePatConstructor
 import codeql.rust.elements.internal.TupleStructPatConstructor
-import codeql.rust.elements.internal.TypeRefConstructor
+import codeql.rust.elements.internal.TupleTypeConstructor
+import codeql.rust.elements.internal.TypeAliasConstructor
+import codeql.rust.elements.internal.TypeArgConstructor
+import codeql.rust.elements.internal.TypeBoundConstructor
+import codeql.rust.elements.internal.TypeBoundListConstructor
+import codeql.rust.elements.internal.TypeParamConstructor
 import codeql.rust.elements.internal.UnderscoreExprConstructor
-import codeql.rust.elements.internal.UnimplementedDeclarationConstructor
-import codeql.rust.elements.internal.UnsafeBlockExprConstructor
+import codeql.rust.elements.internal.UnimplementedConstructor
+import codeql.rust.elements.internal.UnionConstructor
+import codeql.rust.elements.internal.UseConstructor
+import codeql.rust.elements.internal.UseTreeConstructor
+import codeql.rust.elements.internal.UseTreeListConstructor
+import codeql.rust.elements.internal.VariantConstructor
+import codeql.rust.elements.internal.VariantListConstructor
+import codeql.rust.elements.internal.VisibilityConstructor
+import codeql.rust.elements.internal.WhereClauseConstructor
+import codeql.rust.elements.internal.WherePredConstructor
+import codeql.rust.elements.internal.WhileExprConstructor
 import codeql.rust.elements.internal.WildcardPatConstructor
 import codeql.rust.elements.internal.YeetExprConstructor
 import codeql.rust.elements.internal.YieldExprConstructor
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll
new file mode 100644
index 0000000000000..a49bf0845aaf8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TokenTree.qll
@@ -0,0 +1,23 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TokenTree`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TokenTree` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TokenTree` class directly.
+   * Use the subclass `TokenTree`, where the following predicates are available.
+   */
+  class TokenTree extends Synth::TTokenTree, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "TokenTree" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
new file mode 100644
index 0000000000000..1f1e20d9beb2d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll
@@ -0,0 +1,132 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Trait`.
+ * 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.AssocItemList
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Trait` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Trait` class directly.
+   * Use the subclass `Trait`, where the following predicates are available.
+   */
+  class Trait extends Synth::TTrait, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Trait" }
+
+    /**
+     * Gets the assoc item list of this trait, if it exists.
+     */
+    AssocItemList getAssocItemList() {
+      result =
+        Synth::convertAssocItemListFromRaw(Synth::convertTraitToRaw(this)
+              .(Raw::Trait)
+              .getAssocItemList())
+    }
+
+    /**
+     * Holds if `getAssocItemList()` exists.
+     */
+    final predicate hasAssocItemList() { exists(this.getAssocItemList()) }
+
+    /**
+     * Gets the `index`th attr of this trait (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertTraitToRaw(this).(Raw::Trait).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this trait.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this trait.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the generic parameter list of this trait, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertTraitToRaw(this)
+              .(Raw::Trait)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the name of this trait, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertTraitToRaw(this).(Raw::Trait).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the type bound list of this trait, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertTraitToRaw(this)
+              .(Raw::Trait)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+
+    /**
+     * Gets the visibility of this trait, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertTraitToRaw(this).(Raw::Trait).getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this trait, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertTraitToRaw(this)
+              .(Raw::Trait)
+              .getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TraitAlias.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TraitAlias.qll
new file mode 100644
index 0000000000000..906fd934a1a0e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TraitAlias.qll
@@ -0,0 +1,122 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TraitAlias`.
+ * 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.Name
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TraitAlias` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TraitAlias` class directly.
+   * Use the subclass `TraitAlias`, where the following predicates are available.
+   */
+  class TraitAlias extends Synth::TTraitAlias, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "TraitAlias" }
+
+    /**
+     * Gets the `index`th attr of this trait alias (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertTraitAliasToRaw(this)
+              .(Raw::TraitAlias)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this trait alias.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this trait alias.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the generic parameter list of this trait alias, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertTraitAliasToRaw(this)
+              .(Raw::TraitAlias)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the name of this trait alias, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertTraitAliasToRaw(this).(Raw::TraitAlias).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the type bound list of this trait alias, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertTraitAliasToRaw(this)
+              .(Raw::TraitAlias)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+
+    /**
+     * Gets the visibility of this trait alias, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertTraitAliasToRaw(this)
+              .(Raw::TraitAlias)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this trait alias, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertTraitAliasToRaw(this)
+              .(Raw::TraitAlias)
+              .getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TryExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TryExpr.qll
new file mode 100644
index 0000000000000..68aa77d4d70f9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TryExpr.qll
@@ -0,0 +1,55 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TryExpr`.
+ * 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.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TryExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TryExpr` class directly.
+   * Use the subclass `TryExpr`, where the following predicates are available.
+   */
+  class TryExpr extends Synth::TTryExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "TryExpr" }
+
+    /**
+     * Gets the `index`th attr of this try expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertTryExprToRaw(this).(Raw::TryExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this try expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this try expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this try expression, if it exists.
+     */
+    Expr getExpr() {
+      result = Synth::convertExprFromRaw(Synth::convertTryExprToRaw(this).(Raw::TryExpr).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
index 1e76578a811f3..c91e23c3732e2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,11 +16,6 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * A tuple expression. For example:
-   * ```
-   * (1, "one");
-   * (2, "two")[0] = 3;
-   * ```
    * INTERNAL: Do not reference the `Generated::TupleExpr` class directly.
    * Use the subclass `TupleExpr`, where the following predicates are available.
    */
@@ -27,28 +23,41 @@ module Generated {
     override string getAPrimaryQlClass() { result = "TupleExpr" }
 
     /**
-     * Gets the `index`th expression of this tuple expression (0-based).
+     * Gets the `index`th attr of this tuple expression (0-based).
      */
-    Expr getExpr(int index) {
+    Attr getAttr(int index) {
       result =
-        Synth::convertExprFromRaw(Synth::convertTupleExprToRaw(this).(Raw::TupleExpr).getExpr(index))
+        Synth::convertAttrFromRaw(Synth::convertTupleExprToRaw(this).(Raw::TupleExpr).getAttr(index))
     }
 
     /**
-     * Gets any of the expressions of this tuple expression.
+     * Gets any of the attrs of this tuple expression.
      */
-    final Expr getAnExpr() { result = this.getExpr(_) }
+    final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of expressions of this tuple expression.
+     * Gets the number of attrs of this tuple expression.
      */
-    final int getNumberOfExprs() { result = count(int i | exists(this.getExpr(i))) }
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Holds if this tuple expression is assignee expression.
+     * Gets the `index`th field of this tuple expression (0-based).
      */
-    predicate isAssigneeExpr() {
-      Synth::convertTupleExprToRaw(this).(Raw::TupleExpr).isAssigneeExpr()
+    Expr getField(int index) {
+      result =
+        Synth::convertExprFromRaw(Synth::convertTupleExprToRaw(this)
+              .(Raw::TupleExpr)
+              .getField(index))
     }
+
+    /**
+     * Gets any of the fields of this tuple expression.
+     */
+    final Expr getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this tuple expression.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
new file mode 100644
index 0000000000000..c31dacfcbca3a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
@@ -0,0 +1,74 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TupleField`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Type
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TupleField` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TupleField` class directly.
+   * Use the subclass `TupleField`, where the following predicates are available.
+   */
+  class TupleField extends Synth::TTupleField, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "TupleField" }
+
+    /**
+     * Gets the `index`th attr of this tuple field (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertTupleFieldToRaw(this)
+              .(Raw::TupleField)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this tuple field.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this tuple field.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the ty of this tuple field, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertTupleFieldToRaw(this).(Raw::TupleField).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the visibility of this tuple field, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertTupleFieldToRaw(this)
+              .(Raw::TupleField)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll
new file mode 100644
index 0000000000000..edc89b77d80e0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleFieldList.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TupleFieldList`.
+ * 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.FieldListImpl::Impl as FieldListImpl
+import codeql.rust.elements.TupleField
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TupleFieldList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TupleFieldList` class directly.
+   * Use the subclass `TupleFieldList`, where the following predicates are available.
+   */
+  class TupleFieldList extends Synth::TTupleFieldList, FieldListImpl::FieldList {
+    override string getAPrimaryQlClass() { result = "TupleFieldList" }
+
+    /**
+     * Gets the `index`th field of this tuple field list (0-based).
+     */
+    TupleField getField(int index) {
+      result =
+        Synth::convertTupleFieldFromRaw(Synth::convertTupleFieldListToRaw(this)
+              .(Raw::TupleFieldList)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this tuple field list.
+     */
+    final TupleField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this tuple field list.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
index 3c59bf1ee7a3f..12fd54c40dc48 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
@@ -15,11 +15,6 @@ import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
  */
 module Generated {
   /**
-   * A tuple pattern. For example:
-   * ```
-   * let (x, y) = (1, 2);
-   * let (a, b, ..,  z) = (1, 2, 3, 4, 5);
-   * ```
    * INTERNAL: Do not reference the `Generated::TuplePat` class directly.
    * Use the subclass `TuplePat`, where the following predicates are available.
    */
@@ -27,33 +22,21 @@ module Generated {
     override string getAPrimaryQlClass() { result = "TuplePat" }
 
     /**
-     * Gets the `index`th argument of this tuple pat (0-based).
+     * Gets the `index`th field of this tuple pat (0-based).
      */
-    Pat getArg(int index) {
+    Pat getField(int index) {
       result =
-        Synth::convertPatFromRaw(Synth::convertTuplePatToRaw(this).(Raw::TuplePat).getArg(index))
+        Synth::convertPatFromRaw(Synth::convertTuplePatToRaw(this).(Raw::TuplePat).getField(index))
     }
 
     /**
-     * Gets any of the arguments of this tuple pat.
+     * Gets any of the fields of this tuple pat.
      */
-    final Pat getAnArg() { result = this.getArg(_) }
+    final Pat getAField() { result = this.getField(_) }
 
     /**
-     * Gets the number of arguments of this tuple pat.
+     * Gets the number of fields of this tuple pat.
      */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
-
-    /**
-     * Gets the ellipsis index of this tuple pat, if it exists.
-     */
-    int getEllipsisIndex() {
-      result = Synth::convertTuplePatToRaw(this).(Raw::TuplePat).getEllipsisIndex()
-    }
-
-    /**
-     * Holds if `getEllipsisIndex()` exists.
-     */
-    final predicate hasEllipsisIndex() { exists(this.getEllipsisIndex()) }
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
index 33d4ca1f5e6ff..41033c2db1dd3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
@@ -16,14 +16,6 @@ import codeql.rust.elements.Path
  */
 module Generated {
   /**
-   * A tuple struct pattern. For example:
-   * ```
-   * match x {
-   *     Tuple("a", 1, 2, 3) => "great",
-   *     Tuple(.., 3) => "fine",
-   *     Tuple(..) => "fail",
-   * };
-   * ```
    * INTERNAL: Do not reference the `Generated::TupleStructPat` class directly.
    * Use the subclass `TupleStructPat`, where the following predicates are available.
    */
@@ -31,50 +23,38 @@ module Generated {
     override string getAPrimaryQlClass() { result = "TupleStructPat" }
 
     /**
-     * Gets the path of this tuple struct pat, if it exists.
+     * Gets the `index`th field of this tuple struct pat (0-based).
      */
-    Path getPath() {
-      result =
-        Synth::convertPathFromRaw(Synth::convertTupleStructPatToRaw(this)
-              .(Raw::TupleStructPat)
-              .getPath())
-    }
-
-    /**
-     * Holds if `getPath()` exists.
-     */
-    final predicate hasPath() { exists(this.getPath()) }
-
-    /**
-     * Gets the `index`th argument of this tuple struct pat (0-based).
-     */
-    Pat getArg(int index) {
+    Pat getField(int index) {
       result =
         Synth::convertPatFromRaw(Synth::convertTupleStructPatToRaw(this)
               .(Raw::TupleStructPat)
-              .getArg(index))
+              .getField(index))
     }
 
     /**
-     * Gets any of the arguments of this tuple struct pat.
+     * Gets any of the fields of this tuple struct pat.
      */
-    final Pat getAnArg() { result = this.getArg(_) }
+    final Pat getAField() { result = this.getField(_) }
 
     /**
-     * Gets the number of arguments of this tuple struct pat.
+     * Gets the number of fields of this tuple struct pat.
      */
-    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
 
     /**
-     * Gets the ellipsis index of this tuple struct pat, if it exists.
+     * Gets the path of this tuple struct pat, if it exists.
      */
-    int getEllipsisIndex() {
-      result = Synth::convertTupleStructPatToRaw(this).(Raw::TupleStructPat).getEllipsisIndex()
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertTupleStructPatToRaw(this)
+              .(Raw::TupleStructPat)
+              .getPath())
     }
 
     /**
-     * Holds if `getEllipsisIndex()` exists.
+     * Holds if `getPath()` exists.
      */
-    final predicate hasEllipsisIndex() { exists(this.getEllipsisIndex()) }
+    final predicate hasPath() { exists(this.getPath()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll
new file mode 100644
index 0000000000000..e7b7559ddec29
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TupleType`.
+ * 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.Type
+import codeql.rust.elements.internal.TypeImpl::Impl as TypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TupleType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TupleType` class directly.
+   * Use the subclass `TupleType`, where the following predicates are available.
+   */
+  class TupleType extends Synth::TTupleType, TypeImpl::Type {
+    override string getAPrimaryQlClass() { result = "TupleType" }
+
+    /**
+     * Gets the `index`th field of this tuple type (0-based).
+     */
+    Type getField(int index) {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertTupleTypeToRaw(this)
+              .(Raw::TupleType)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this tuple type.
+     */
+    final Type getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this tuple type.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Type.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Type.qll
new file mode 100644
index 0000000000000..ae7d8d1320131
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Type.qll
@@ -0,0 +1,21 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Type`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Type` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Type` class directly.
+   * Use the subclass `Type`, where the following predicates are available.
+   */
+  class Type extends Synth::TType, AstNodeImpl::AstNode { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
new file mode 100644
index 0000000000000..ab6a1b7132f74
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
@@ -0,0 +1,138 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TypeAlias`.
+ * 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.AssocItemImpl::Impl as AssocItemImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TypeAlias` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TypeAlias` class directly.
+   * Use the subclass `TypeAlias`, where the following predicates are available.
+   */
+  class TypeAlias extends Synth::TTypeAlias, AssocItemImpl::AssocItem, ExternItemImpl::ExternItem,
+    ItemImpl::Item
+  {
+    override string getAPrimaryQlClass() { result = "TypeAlias" }
+
+    /**
+     * Gets the `index`th attr of this type alias (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertTypeAliasToRaw(this).(Raw::TypeAlias).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this type alias.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this type alias.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the generic parameter list of this type alias, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertTypeAliasToRaw(this)
+              .(Raw::TypeAlias)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the name of this type alias, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertTypeAliasToRaw(this).(Raw::TypeAlias).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the ty of this type alias, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertTypeAliasToRaw(this).(Raw::TypeAlias).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the type bound list of this type alias, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertTypeAliasToRaw(this)
+              .(Raw::TypeAlias)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+
+    /**
+     * Gets the visibility of this type alias, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertTypeAliasToRaw(this)
+              .(Raw::TypeAlias)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Gets the where clause of this type alias, if it exists.
+     */
+    WhereClause getWhereClause() {
+      result =
+        Synth::convertWhereClauseFromRaw(Synth::convertTypeAliasToRaw(this)
+              .(Raw::TypeAlias)
+              .getWhereClause())
+    }
+
+    /**
+     * Holds if `getWhereClause()` exists.
+     */
+    final predicate hasWhereClause() { exists(this.getWhereClause()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
new file mode 100644
index 0000000000000..997a943ecf345
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
@@ -0,0 +1,36 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TypeArg`.
+ * 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.GenericArgImpl::Impl as GenericArgImpl
+import codeql.rust.elements.Type
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TypeArg` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TypeArg` class directly.
+   * Use the subclass `TypeArg`, where the following predicates are available.
+   */
+  class TypeArg extends Synth::TTypeArg, GenericArgImpl::GenericArg {
+    override string getAPrimaryQlClass() { result = "TypeArg" }
+
+    /**
+     * Gets the ty of this type argument, if it exists.
+     */
+    Type getTy() {
+      result = Synth::convertTypeFromRaw(Synth::convertTypeArgToRaw(this).(Raw::TypeArg).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
new file mode 100644
index 0000000000000..38d7f656e7048
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
@@ -0,0 +1,69 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TypeBound`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.Type
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TypeBound` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TypeBound` class directly.
+   * Use the subclass `TypeBound`, where the following predicates are available.
+   */
+  class TypeBound extends Synth::TTypeBound, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "TypeBound" }
+
+    /**
+     * Gets the generic parameter list of this type bound, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertTypeBoundToRaw(this)
+              .(Raw::TypeBound)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the lifetime of this type bound, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertTypeBoundToRaw(this)
+              .(Raw::TypeBound)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the ty of this type bound, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertTypeBoundToRaw(this).(Raw::TypeBound).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBoundList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBoundList.qll
new file mode 100644
index 0000000000000..1271f888650c3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBoundList.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TypeBoundList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.TypeBound
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TypeBoundList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TypeBoundList` class directly.
+   * Use the subclass `TypeBoundList`, where the following predicates are available.
+   */
+  class TypeBoundList extends Synth::TTypeBoundList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "TypeBoundList" }
+
+    /**
+     * Gets the `index`th bound of this type bound list (0-based).
+     */
+    TypeBound getBound(int index) {
+      result =
+        Synth::convertTypeBoundFromRaw(Synth::convertTypeBoundListToRaw(this)
+              .(Raw::TypeBoundList)
+              .getBound(index))
+    }
+
+    /**
+     * Gets any of the bounds of this type bound list.
+     */
+    final TypeBound getABound() { result = this.getBound(_) }
+
+    /**
+     * Gets the number of bounds of this type bound list.
+     */
+    final int getNumberOfBounds() { result = count(int i | exists(this.getBound(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
new file mode 100644
index 0000000000000..cd50dfdf5d903
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
@@ -0,0 +1,88 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TypeParam`.
+ * 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.internal.GenericParamImpl::Impl as GenericParamImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.Type
+import codeql.rust.elements.TypeBoundList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TypeParam` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::TypeParam` class directly.
+   * Use the subclass `TypeParam`, where the following predicates are available.
+   */
+  class TypeParam extends Synth::TTypeParam, GenericParamImpl::GenericParam {
+    override string getAPrimaryQlClass() { result = "TypeParam" }
+
+    /**
+     * Gets the `index`th attr of this type parameter (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertTypeParamToRaw(this).(Raw::TypeParam).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this type parameter.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this type parameter.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the default type of this type parameter, if it exists.
+     */
+    Type getDefaultType() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertTypeParamToRaw(this)
+              .(Raw::TypeParam)
+              .getDefaultType())
+    }
+
+    /**
+     * Holds if `getDefaultType()` exists.
+     */
+    final predicate hasDefaultType() { exists(this.getDefaultType()) }
+
+    /**
+     * Gets the name of this type parameter, if it exists.
+     */
+    Name getName() {
+      result =
+        Synth::convertNameFromRaw(Synth::convertTypeParamToRaw(this).(Raw::TypeParam).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the type bound list of this type parameter, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertTypeParamToRaw(this)
+              .(Raw::TypeParam)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll
deleted file mode 100644
index 80737704c8394..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll
+++ /dev/null
@@ -1,30 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `TypeRef`.
- * 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.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.internal.UnimplementedImpl::Impl as UnimplementedImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `TypeRef` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * The base class for type references.
-   * ```
-   * let x: i32;
-   * let y: Vec<i32>;
-   * let z: Option<i32>;
-   * ```
-   * INTERNAL: Do not reference the `Generated::TypeRef` class directly.
-   * Use the subclass `TypeRef`, where the following predicates are available.
-   */
-  class TypeRef extends Synth::TTypeRef, AstNodeImpl::AstNode, UnimplementedImpl::Unimplemented {
-    override string getAPrimaryQlClass() { result = "TypeRef" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll
index 8cbefcb9810bf..2ed8dde73bae5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll
@@ -6,6 +6,7 @@
 
 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.internal.ExprImpl::Impl as ExprImpl
 
 /**
@@ -14,14 +15,30 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * An underscore expression. For example:
-   * ```
-   * _ = 42;
-   * ```
    * INTERNAL: Do not reference the `Generated::UnderscoreExpr` class directly.
    * Use the subclass `UnderscoreExpr`, where the following predicates are available.
    */
   class UnderscoreExpr extends Synth::TUnderscoreExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "UnderscoreExpr" }
+
+    /**
+     * Gets the `index`th attr of this underscore expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertUnderscoreExprToRaw(this)
+              .(Raw::UnderscoreExpr)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this underscore expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this underscore expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll
index 7772db79adb0f..04e38d47781da 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Unimplemented.qll
@@ -18,5 +18,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Unimplemented` class directly.
    * Use the subclass `Unimplemented`, where the following predicates are available.
    */
-  class Unimplemented extends Synth::TUnimplemented, UnextractedImpl::Unextracted { }
+  class Unimplemented extends Synth::TUnimplemented, UnextractedImpl::Unextracted {
+    override string getAPrimaryQlClass() { result = "Unimplemented" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UnimplementedDeclaration.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UnimplementedDeclaration.qll
deleted file mode 100644
index 2acd04d4caa1f..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UnimplementedDeclaration.qll
+++ /dev/null
@@ -1,27 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `UnimplementedDeclaration`.
- * 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.DeclarationImpl::Impl as DeclarationImpl
-import codeql.rust.elements.internal.UnimplementedImpl::Impl as UnimplementedImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `UnimplementedDeclaration` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A declaration that is not yet extracted.
-   * INTERNAL: Do not reference the `Generated::UnimplementedDeclaration` class directly.
-   * Use the subclass `UnimplementedDeclaration`, where the following predicates are available.
-   */
-  class UnimplementedDeclaration extends Synth::TUnimplementedDeclaration,
-    DeclarationImpl::Declaration, UnimplementedImpl::Unimplemented
-  {
-    override string getAPrimaryQlClass() { result = "UnimplementedDeclaration" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll
new file mode 100644
index 0000000000000..7c548210b737b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Union.qll
@@ -0,0 +1,117 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Union`.
+ * 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.AdtImpl::Impl as AdtImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.Name
+import codeql.rust.elements.RecordFieldList
+import codeql.rust.elements.Visibility
+import codeql.rust.elements.WhereClause
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Union` and should not
+ * be referenced directly.
+ */
+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, ItemImpl::Item {
+    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 record field list of this union, if it exists.
+     */
+    RecordFieldList getRecordFieldList() {
+      result =
+        Synth::convertRecordFieldListFromRaw(Synth::convertUnionToRaw(this)
+              .(Raw::Union)
+              .getRecordFieldList())
+    }
+
+    /**
+     * Holds if `getRecordFieldList()` exists.
+     */
+    final predicate hasRecordFieldList() { exists(this.getRecordFieldList()) }
+
+    /**
+     * 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/codeql/rust/elements/internal/generated/UnsafeBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UnsafeBlockExpr.qll
deleted file mode 100644
index 50dc7c9b17f15..0000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UnsafeBlockExpr.qll
+++ /dev/null
@@ -1,30 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `UnsafeBlockExpr`.
- * 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.BlockExprBaseImpl::Impl as BlockExprBaseImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `UnsafeBlockExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * An unsafe block expression. For example:
-   * ```
-   * let layout = unsafe {
-   *     let x = 42;
-   *     Layout::from_size_align_unchecked(size, align)
-   * };
-   * ```
-   * INTERNAL: Do not reference the `Generated::UnsafeBlockExpr` class directly.
-   * Use the subclass `UnsafeBlockExpr`, where the following predicates are available.
-   */
-  class UnsafeBlockExpr extends Synth::TUnsafeBlockExpr, BlockExprBaseImpl::BlockExprBase {
-    override string getAPrimaryQlClass() { result = "UnsafeBlockExpr" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Use.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Use.qll
new file mode 100644
index 0000000000000..8888368ecb3d0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Use.qll
@@ -0,0 +1,68 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Use`.
+ * 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.internal.ItemImpl::Impl as ItemImpl
+import codeql.rust.elements.UseTree
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Use` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Use` class directly.
+   * Use the subclass `Use`, where the following predicates are available.
+   */
+  class Use extends Synth::TUse, ItemImpl::Item {
+    override string getAPrimaryQlClass() { result = "Use" }
+
+    /**
+     * Gets the `index`th attr of this use (0-based).
+     */
+    Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(Synth::convertUseToRaw(this).(Raw::Use).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this use.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this use.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the use tree of this use, if it exists.
+     */
+    UseTree getUseTree() {
+      result = Synth::convertUseTreeFromRaw(Synth::convertUseToRaw(this).(Raw::Use).getUseTree())
+    }
+
+    /**
+     * Holds if `getUseTree()` exists.
+     */
+    final predicate hasUseTree() { exists(this.getUseTree()) }
+
+    /**
+     * Gets the visibility of this use, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertUseToRaw(this).(Raw::Use).getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UseTree.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTree.qll
new file mode 100644
index 0000000000000..b3cbd43be83d6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTree.qll
@@ -0,0 +1,66 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `UseTree`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Path
+import codeql.rust.elements.Rename
+import codeql.rust.elements.UseTreeList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `UseTree` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::UseTree` class directly.
+   * Use the subclass `UseTree`, where the following predicates are available.
+   */
+  class UseTree extends Synth::TUseTree, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "UseTree" }
+
+    /**
+     * Gets the path of this use tree, if it exists.
+     */
+    Path getPath() {
+      result = Synth::convertPathFromRaw(Synth::convertUseTreeToRaw(this).(Raw::UseTree).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+
+    /**
+     * Gets the rename of this use tree, if it exists.
+     */
+    Rename getRename() {
+      result =
+        Synth::convertRenameFromRaw(Synth::convertUseTreeToRaw(this).(Raw::UseTree).getRename())
+    }
+
+    /**
+     * Holds if `getRename()` exists.
+     */
+    final predicate hasRename() { exists(this.getRename()) }
+
+    /**
+     * Gets the use tree list of this use tree, if it exists.
+     */
+    UseTreeList getUseTreeList() {
+      result =
+        Synth::convertUseTreeListFromRaw(Synth::convertUseTreeToRaw(this)
+              .(Raw::UseTree)
+              .getUseTreeList())
+    }
+
+    /**
+     * Holds if `getUseTreeList()` exists.
+     */
+    final predicate hasUseTreeList() { exists(this.getUseTreeList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll
new file mode 100644
index 0000000000000..b666449bbd70f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UseTreeList.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `UseTreeList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.UseTree
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `UseTreeList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::UseTreeList` class directly.
+   * Use the subclass `UseTreeList`, where the following predicates are available.
+   */
+  class UseTreeList extends Synth::TUseTreeList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "UseTreeList" }
+
+    /**
+     * Gets the `index`th use tree of this use tree list (0-based).
+     */
+    UseTree getUseTree(int index) {
+      result =
+        Synth::convertUseTreeFromRaw(Synth::convertUseTreeListToRaw(this)
+              .(Raw::UseTreeList)
+              .getUseTree(index))
+    }
+
+    /**
+     * Gets any of the use trees of this use tree list.
+     */
+    final UseTree getAUseTree() { result = this.getUseTree(_) }
+
+    /**
+     * Gets the number of use trees of this use tree list.
+     */
+    final int getNumberOfUseTrees() { result = count(int i | exists(this.getUseTree(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
new file mode 100644
index 0000000000000..71221bb7e395e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
@@ -0,0 +1,100 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Variant`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.FieldList
+import codeql.rust.elements.Name
+import codeql.rust.elements.Visibility
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Variant` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Variant` class directly.
+   * Use the subclass `Variant`, where the following predicates are available.
+   */
+  class Variant extends Synth::TVariant, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Variant" }
+
+    /**
+     * Gets the `index`th attr of this variant (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this variant.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this variant.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the expression of this variant, if it exists.
+     */
+    Expr getExpr() {
+      result = Synth::convertExprFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getExpr())
+    }
+
+    /**
+     * Holds if `getExpr()` exists.
+     */
+    final predicate hasExpr() { exists(this.getExpr()) }
+
+    /**
+     * Gets the field list of this variant, if it exists.
+     */
+    FieldList getFieldList() {
+      result =
+        Synth::convertFieldListFromRaw(Synth::convertVariantToRaw(this)
+              .(Raw::Variant)
+              .getFieldList())
+    }
+
+    /**
+     * Holds if `getFieldList()` exists.
+     */
+    final predicate hasFieldList() { exists(this.getFieldList()) }
+
+    /**
+     * Gets the name of this variant, if it exists.
+     */
+    Name getName() {
+      result = Synth::convertNameFromRaw(Synth::convertVariantToRaw(this).(Raw::Variant).getName())
+    }
+
+    /**
+     * Holds if `getName()` exists.
+     */
+    final predicate hasName() { exists(this.getName()) }
+
+    /**
+     * Gets the visibility of this variant, if it exists.
+     */
+    Visibility getVisibility() {
+      result =
+        Synth::convertVisibilityFromRaw(Synth::convertVariantToRaw(this)
+              .(Raw::Variant)
+              .getVisibility())
+    }
+
+    /**
+     * Holds if `getVisibility()` exists.
+     */
+    final predicate hasVisibility() { exists(this.getVisibility()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/VariantList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/VariantList.qll
new file mode 100644
index 0000000000000..3ece8597d014d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/VariantList.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `VariantList`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Variant
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `VariantList` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::VariantList` class directly.
+   * Use the subclass `VariantList`, where the following predicates are available.
+   */
+  class VariantList extends Synth::TVariantList, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "VariantList" }
+
+    /**
+     * Gets the `index`th variant of this variant list (0-based).
+     */
+    Variant getVariant(int index) {
+      result =
+        Synth::convertVariantFromRaw(Synth::convertVariantListToRaw(this)
+              .(Raw::VariantList)
+              .getVariant(index))
+    }
+
+    /**
+     * Gets any of the variants of this variant list.
+     */
+    final Variant getAVariant() { result = this.getVariant(_) }
+
+    /**
+     * Gets the number of variants of this variant list.
+     */
+    final int getNumberOfVariants() { result = count(int i | exists(this.getVariant(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll
new file mode 100644
index 0000000000000..b5d00229e96aa
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Visibility.qll
@@ -0,0 +1,37 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Visibility`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Path
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Visibility` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::Visibility` class directly.
+   * Use the subclass `Visibility`, where the following predicates are available.
+   */
+  class Visibility extends Synth::TVisibility, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "Visibility" }
+
+    /**
+     * Gets the path of this visibility, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertVisibilityToRaw(this).(Raw::Visibility).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WhereClause.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WhereClause.qll
new file mode 100644
index 0000000000000..df007bea418b3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WhereClause.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `WhereClause`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.WherePred
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `WhereClause` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::WhereClause` class directly.
+   * Use the subclass `WhereClause`, where the following predicates are available.
+   */
+  class WhereClause extends Synth::TWhereClause, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "WhereClause" }
+
+    /**
+     * Gets the `index`th predicate of this where clause (0-based).
+     */
+    WherePred getPredicate(int index) {
+      result =
+        Synth::convertWherePredFromRaw(Synth::convertWhereClauseToRaw(this)
+              .(Raw::WhereClause)
+              .getPredicate(index))
+    }
+
+    /**
+     * Gets any of the predicates of this where clause.
+     */
+    final WherePred getAPredicate() { result = this.getPredicate(_) }
+
+    /**
+     * Gets the number of predicates of this where clause.
+     */
+    final int getNumberOfPredicates() { result = count(int i | exists(this.getPredicate(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
new file mode 100644
index 0000000000000..3dc26347d12a2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
@@ -0,0 +1,85 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `WherePred`.
+ * 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.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.Type
+import codeql.rust.elements.TypeBoundList
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `WherePred` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::WherePred` class directly.
+   * Use the subclass `WherePred`, where the following predicates are available.
+   */
+  class WherePred extends Synth::TWherePred, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "WherePred" }
+
+    /**
+     * Gets the generic parameter list of this where pred, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertWherePredToRaw(this)
+              .(Raw::WherePred)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the lifetime of this where pred, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertWherePredToRaw(this)
+              .(Raw::WherePred)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the ty of this where pred, if it exists.
+     */
+    Type getTy() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertWherePredToRaw(this).(Raw::WherePred).getTy())
+    }
+
+    /**
+     * Holds if `getTy()` exists.
+     */
+    final predicate hasTy() { exists(this.getTy()) }
+
+    /**
+     * Gets the type bound list of this where pred, if it exists.
+     */
+    TypeBoundList getTypeBoundList() {
+      result =
+        Synth::convertTypeBoundListFromRaw(Synth::convertWherePredToRaw(this)
+              .(Raw::WherePred)
+              .getTypeBoundList())
+    }
+
+    /**
+     * Holds if `getTypeBoundList()` exists.
+     */
+    final predicate hasTypeBoundList() { exists(this.getTypeBoundList()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll
new file mode 100644
index 0000000000000..4542976589be5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll
@@ -0,0 +1,86 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `WhileExpr`.
+ * 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.BlockExpr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.Label
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `WhileExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::WhileExpr` class directly.
+   * Use the subclass `WhileExpr`, where the following predicates are available.
+   */
+  class WhileExpr extends Synth::TWhileExpr, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "WhileExpr" }
+
+    /**
+     * Gets the `index`th attr of this while expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertWhileExprToRaw(this).(Raw::WhileExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this while expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this while expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the condition of this while expression, if it exists.
+     */
+    Expr getCondition() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertWhileExprToRaw(this).(Raw::WhileExpr).getCondition())
+    }
+
+    /**
+     * Holds if `getCondition()` exists.
+     */
+    final predicate hasCondition() { exists(this.getCondition()) }
+
+    /**
+     * Gets the label of this while expression, if it exists.
+     */
+    Label getLabel() {
+      result =
+        Synth::convertLabelFromRaw(Synth::convertWhileExprToRaw(this).(Raw::WhileExpr).getLabel())
+    }
+
+    /**
+     * Holds if `getLabel()` exists.
+     */
+    final predicate hasLabel() { exists(this.getLabel()) }
+
+    /**
+     * Gets the loop body of this while expression, if it exists.
+     */
+    BlockExpr getLoopBody() {
+      result =
+        Synth::convertBlockExprFromRaw(Synth::convertWhileExprToRaw(this)
+              .(Raw::WhileExpr)
+              .getLoopBody())
+    }
+
+    /**
+     * Holds if `getLoopBody()` exists.
+     */
+    final predicate hasLoopBody() { exists(this.getLoopBody()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WildcardPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WildcardPat.qll
index 63de48dc7c02e..d65daf7911a36 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/WildcardPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WildcardPat.qll
@@ -14,10 +14,6 @@ import codeql.rust.elements.internal.PatImpl::Impl as PatImpl
  */
 module Generated {
   /**
-   * A wildcard pattern. For example:
-   * ```
-   * let _ = 42;
-   * ```
    * INTERNAL: Do not reference the `Generated::WildcardPat` class directly.
    * Use the subclass `WildcardPat`, where the following predicates are available.
    */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll
index 44c754267d8ba..3f2d7194d5158 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/YeetExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,18 +16,30 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * A `yeet` expression. For example:
-   * ```
-   * if x < size {
-   *    do yeet "index out of bounds";
-   * }
-   * ```
    * INTERNAL: Do not reference the `Generated::YeetExpr` class directly.
    * Use the subclass `YeetExpr`, where the following predicates are available.
    */
   class YeetExpr extends Synth::TYeetExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "YeetExpr" }
 
+    /**
+     * Gets the `index`th attr of this yeet expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertYeetExprToRaw(this).(Raw::YeetExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this yeet expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this yeet expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the expression of this yeet expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll
index ccb436a0b0f6a..0bdfb90563bd4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/YieldExpr.qll
@@ -6,6 +6,7 @@
 
 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.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
@@ -15,19 +16,30 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * A `yield` expression. For example:
-   * ```
-   * let one = #[coroutine]
-   *     || {
-   *         yield 1;
-   *     };
-   * ```
    * INTERNAL: Do not reference the `Generated::YieldExpr` class directly.
    * Use the subclass `YieldExpr`, where the following predicates are available.
    */
   class YieldExpr extends Synth::TYieldExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "YieldExpr" }
 
+    /**
+     * Gets the `index`th attr of this yield expression (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertYieldExprToRaw(this).(Raw::YieldExpr).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this yield expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this yield expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
     /**
      * Gets the expression of this yield expression, if it exists.
      */
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index 46c5a1a2f0bbf..4001dfac84306 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -134,92 +134,454 @@ locatable_locations(
 ;
 
 @ast_node =
-  @declaration
+  @abi
+| @adt
+| @arg_list
+| @assoc_item
+| @assoc_item_list
+| @attr
+| @closure_binder
 | @expr
+| @extern_item
+| @extern_item_list
+| @field_list
+| @format_args_arg
+| @generic_arg
 | @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
 | @label
+| @let_else
+| @lifetime
+| @macro_items
+| @macro_stmts
 | @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @name_ref
+| @param
+| @param_list
 | @pat
 | @path
+| @path_segment
 | @record_expr_field
+| @record_expr_field_list
+| @record_field
 | @record_pat_field
+| @record_pat_field_list
+| @rename
+| @ret_type
+| @return_type_syntax
+| @self_param
+| @source_file
 | @stmt
-| @type_ref
+| @stmt_list
+| @token_tree
+| @tuple_field
+| @type
+| @type_bound
+| @type_bound_list
+| @use_tree
+| @use_tree_list
+| @variant
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
 ;
 
-@missing =
-  @missing_expr
-| @missing_pat
-;
+missings(
+  unique int id: @missing
+);
 
-@unimplemented =
-  @generic_arg_list
-| @path
-| @type_ref
-| @unimplemented_declaration
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+@adt =
+  @enum
+| @struct
+| @union
 ;
 
-@declaration =
-  @function
-| @module
-| @unimplemented_declaration
+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
+);
+
+@assoc_item =
+  @const
+| @fn
+| @macro_call
+| @type_alias
 ;
 
+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
+);
+
+closure_binders(
+  unique int id: @closure_binder
+);
+
+#keyset[id]
+closure_binder_generic_param_lists(
+  int id: @closure_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
 @expr =
   @array_expr
 | @asm_expr
 | @await_expr
 | @become_expr
 | @binary_expr
-| @block_expr_base
-| @box_expr
+| @block_expr
 | @break_expr
 | @call_expr
 | @cast_expr
 | @closure_expr
-| @const_expr
 | @continue_expr
 | @field_expr
+| @for_expr
+| @format_args_expr
 | @if_expr
 | @index_expr
 | @let_expr
-| @literal_expr
+| @literal
 | @loop_expr
+| @macro_expr
 | @match_expr
 | @method_call_expr
-| @missing_expr
 | @offset_of_expr
+| @paren_expr
 | @path_expr
 | @prefix_expr
 | @range_expr
 | @record_expr
 | @ref_expr
 | @return_expr
+| @try_expr
 | @tuple_expr
 | @underscore_expr
+| @while_expr
 | @yeet_expr
 | @yield_expr
 ;
 
+@extern_item =
+  @fn
+| @macro_call
+| @static
+| @type_alias
+;
+
+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 =
+  @record_field_list
+| @tuple_field_list
+;
+
+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,
-  string name: string ref
+  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
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+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
+);
+
+macro_stmts(
+  unique int id: @macro_stmts
+);
+
+#keyset[id]
+macro_stmts_exprs(
+  int id: @macro_stmts ref,
+  int expr: @expr ref
+);
+
+#keyset[id, index]
+macro_stmts_statements(
+  int id: @macro_stmts ref,
+  int index: int ref,
+  int statement: @stmt ref
 );
 
 match_arms(
-  unique int id: @match_arm,
-  int pat: @pat ref,
+  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: @expr 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_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
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id, index]
+param_attrs(
+  int id: @param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+param_ties(
+  int id: @param ref,
+  int ty: @type 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
 );
 
 @pat =
@@ -227,12 +589,14 @@ match_arm_guards(
 | @const_block_pat
 | @ident_pat
 | @literal_pat
-| @missing_pat
+| @macro_pat
 | @or_pat
+| @paren_pat
 | @path_pat
 | @range_pat
 | @record_pat
 | @ref_pat
+| @rest_pat
 | @slice_pat
 | @tuple_pat
 | @tuple_struct_pat
@@ -243,652 +607,2458 @@ paths(
   unique int id: @path
 );
 
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_parts(
+  int id: @path ref,
+  int part: @path_segment 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_name_refs(
+  int id: @path_segment ref,
+  int name_ref: @name_ref ref
+);
+
+#keyset[id]
+path_segment_param_lists(
+  int id: @path_segment ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+path_segment_path_types(
+  int id: @path_segment ref,
+  int path_type: @path_type ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type 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_ties(
+  int id: @path_segment ref,
+  int ty: @type ref
+);
+
 record_expr_fields(
-  unique int id: @record_expr_field,
-  string name: string ref,
+  unique int id: @record_expr_field
+);
+
+#keyset[id, index]
+record_expr_field_attrs(
+  int id: @record_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+record_expr_field_exprs(
+  int id: @record_expr_field ref,
   int expr: @expr ref
 );
 
-record_pat_fields(
-  unique int id: @record_pat_field,
-  string name: string ref,
-  int pat: @pat ref
+#keyset[id]
+record_expr_field_name_refs(
+  int id: @record_expr_field ref,
+  int name_ref: @name_ref ref
 );
 
-@stmt =
-  @expr_stmt
-| @item_stmt
-| @let_stmt
-;
+record_expr_field_lists(
+  unique int id: @record_expr_field_list
+);
+
+#keyset[id, index]
+record_expr_field_list_attrs(
+  int id: @record_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
 
-type_refs(
-  unique int id: @type_ref
+#keyset[id, index]
+record_expr_field_list_fields(
+  int id: @record_expr_field_list ref,
+  int index: int ref,
+  int field: @record_expr_field ref
 );
 
-@array_expr =
-  @element_list_expr
-| @repeat_expr
-;
+#keyset[id]
+record_expr_field_list_spreads(
+  int id: @record_expr_field_list ref,
+  int spread: @expr ref
+);
 
-asm_exprs(
-  unique int id: @asm_expr,
-  int expr: @expr ref
+record_fields(
+  unique int id: @record_field
+);
+
+#keyset[id, index]
+record_field_attrs(
+  int id: @record_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+record_field_names(
+  int id: @record_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+record_field_ties(
+  int id: @record_field ref,
+  int ty: @type ref
+);
+
+#keyset[id]
+record_field_visibilities(
+  int id: @record_field ref,
+  int visibility: @visibility ref
+);
+
+record_pat_fields(
+  unique int id: @record_pat_field
+);
+
+#keyset[id, index]
+record_pat_field_attrs(
+  int id: @record_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+record_pat_field_name_refs(
+  int id: @record_pat_field ref,
+  int name_ref: @name_ref ref
+);
+
+#keyset[id]
+record_pat_field_pats(
+  int id: @record_pat_field ref,
+  int pat: @pat ref
+);
+
+record_pat_field_lists(
+  unique int id: @record_pat_field_list
+);
+
+#keyset[id, index]
+record_pat_field_list_fields(
+  int id: @record_pat_field_list ref,
+  int index: int ref,
+  int field: @record_pat_field ref
+);
+
+#keyset[id]
+record_pat_field_list_rest_pats(
+  int id: @record_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_types(
+  unique int id: @ret_type
+);
+
+#keyset[id]
+ret_type_ties(
+  int id: @ret_type ref,
+  int ty: @type ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id, index]
+self_param_attrs(
+  int id: @self_param ref,
+  int index: int ref,
+  int attr: @attr 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
+);
+
+#keyset[id]
+self_param_ties(
+  int id: @self_param ref,
+  int ty: @type ref
+);
+
+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
+);
+
+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_ties(
+  int id: @tuple_field ref,
+  int ty: @type ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+@type =
+  @array_type
+| @dyn_trait_type
+| @fn_ptr_type
+| @for_type
+| @impl_trait_type
+| @infer_type
+| @macro_type
+| @never_type
+| @paren_type
+| @path_type
+| @ptr_type
+| @ref_type
+| @slice_type
+| @tuple_type
+;
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_generic_param_lists(
+  int id: @type_bound ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_ties(
+  int id: @type_bound ref,
+  int ty: @type 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
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#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
+);
+
+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_exprs(
+  int id: @variant ref,
+  int expr: @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
+);
+
+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_generic_param_lists(
+  int id: @where_pred ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_ties(
+  int id: @where_pred ref,
+  int ty: @type ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_exprs(
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_attrs(
+  int id: @array_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_exprs(
+  int id: @array_expr ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+array_types(
+  unique int id: @array_type
+);
+
+#keyset[id]
+array_type_const_args(
+  int id: @array_type ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_ties(
+  int id: @array_type ref,
+  int ty: @type ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+asm_expr_exprs(
+  int id: @asm_expr ref,
+  int expr: @expr 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_name_refs(
+  int id: @assoc_type_arg ref,
+  int name_ref: @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 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_ties(
+  int id: @assoc_type_arg ref,
+  int ty: @type 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_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+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_labels(
+  int id: @block_expr ref,
+  int label: @label ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list 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_exprs(
+  int id: @call_expr ref,
+  int expr: @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_ties(
+  int id: @cast_expr ref,
+  int ty: @type ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id, index]
+closure_expr_attrs(
+  int id: @closure_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_closure_binders(
+  int id: @closure_expr ref,
+  int closure_binder: @closure_binder ref
+);
+
+#keyset[id]
+closure_expr_param_lists(
+  int id: @closure_expr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type 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
+);
+
+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_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_ties(
+  int id: @const_param ref,
+  int ty: @type 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_types(
+  unique int id: @dyn_trait_type
+);
+
+#keyset[id]
+dyn_trait_type_type_bound_lists(
+  int id: @dyn_trait_type 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_exprs(
+  int id: @field_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+field_expr_name_refs(
+  int id: @field_expr ref,
+  int name_ref: @name_ref ref
+);
+
+fn_ptr_types(
+  unique int id: @fn_ptr_type
+);
+
+#keyset[id]
+fn_ptr_type_abis(
+  int id: @fn_ptr_type ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_param_lists(
+  int id: @fn_ptr_type ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_ret_types(
+  int id: @fn_ptr_type ref,
+  int ret_type: @ret_type 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_labels(
+  int id: @for_expr ref,
+  int label: @label ref
+);
+
+#keyset[id]
+for_expr_loop_bodies(
+  int id: @for_expr ref,
+  int loop_body: @block_expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+for_types(
+  unique int id: @for_type
+);
+
+#keyset[id]
+for_type_generic_param_lists(
+  int id: @for_type ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+for_type_ties(
+  int id: @for_type ref,
+  int ty: @type 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_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_else_branches(
+  int id: @if_expr ref,
+  int else_branch: @expr ref
+);
+
+#keyset[id]
+if_expr_then_branches(
+  int id: @if_expr ref,
+  int then_branch: @block_expr ref
+);
+
+impl_trait_types(
+  unique int id: @impl_trait_type
+);
+
+#keyset[id]
+impl_trait_type_type_bound_lists(
+  int id: @impl_trait_type 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_types(
+  unique int id: @infer_type
+);
+
+@item =
+  @const
+| @enum
+| @extern_block
+| @extern_crate
+| @fn
+| @impl
+| @macro_call
+| @macro_def
+| @macro_rules
+| @module
+| @static
+| @struct
+| @trait
+| @trait_alias
+| @type_alias
+| @union
+| @use
+;
+
+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_exprs(
+  int id: @let_expr ref,
+  int expr: @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_ties(
+  int id: @let_stmt ref,
+  int ty: @type 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
+);
+
+literals(
+  unique int id: @literal
+);
+
+#keyset[id, index]
+literal_attrs(
+  int id: @literal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal 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
+);
+
+#keyset[id]
+loop_expr_labels(
+  int id: @loop_expr ref,
+  int label: @label ref
+);
+
+#keyset[id]
+loop_expr_loop_bodies(
+  int id: @loop_expr ref,
+  int loop_body: @block_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_types(
+  unique int id: @macro_type
+);
+
+#keyset[id]
+macro_type_macro_calls(
+  int id: @macro_type 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_exprs(
+  int id: @match_expr ref,
+  int expr: @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_name_refs(
+  int id: @method_call_expr ref,
+  int name_ref: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+never_types(
+  unique int id: @never_type
+);
+
+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_ties(
+  int id: @offset_of_expr ref,
+  int ty: @type 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
+);
+
+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_types(
+  unique int id: @paren_type
+);
+
+#keyset[id]
+paren_type_ties(
+  int id: @paren_type ref,
+  int ty: @type 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
+);
+
+#keyset[id]
+path_expr_paths(
+  int id: @path_expr ref,
+  int path: @path ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+#keyset[id]
+path_pat_paths(
+  int id: @path_pat ref,
+  int path: @path ref
+);
+
+path_types(
+  unique int id: @path_type
+);
+
+#keyset[id]
+path_type_paths(
+  int id: @path_type 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
+);
+
+ptr_types(
+  unique int id: @ptr_type
+);
+
+#keyset[id]
+ptr_type_ties(
+  int id: @ptr_type ref,
+  int ty: @type 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_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_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+record_exprs(
+  unique int id: @record_expr
+);
+
+#keyset[id]
+record_expr_paths(
+  int id: @record_expr ref,
+  int path: @path ref
+);
+
+#keyset[id]
+record_expr_record_expr_field_lists(
+  int id: @record_expr ref,
+  int record_expr_field_list: @record_expr_field_list ref
+);
+
+record_field_lists(
+  unique int id: @record_field_list
+);
+
+#keyset[id, index]
+record_field_list_fields(
+  int id: @record_field_list ref,
+  int index: int ref,
+  int field: @record_field ref
+);
+
+record_pats(
+  unique int id: @record_pat
+);
+
+#keyset[id]
+record_pat_paths(
+  int id: @record_pat ref,
+  int path: @path ref
+);
+
+#keyset[id]
+record_pat_record_pat_field_lists(
+  int id: @record_pat ref,
+  int record_pat_field_list: @record_pat_field_list 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
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_types(
+  unique int id: @ref_type
+);
+
+#keyset[id]
+ref_type_lifetimes(
+  int id: @ref_type ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_ties(
+  int id: @ref_type ref,
+  int ty: @type 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
+);
+
+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_types(
+  unique int id: @slice_type
+);
+
+#keyset[id]
+slice_type_ties(
+  int id: @slice_type ref,
+  int ty: @type 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
+);
+
+#keyset[id]
+tuple_struct_pat_paths(
+  int id: @tuple_struct_pat ref,
+  int path: @path ref
+);
+
+tuple_types(
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_fields(
+  int id: @tuple_type ref,
+  int index: int ref,
+  int field: @type ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_ties(
+  int id: @type_arg ref,
+  int ty: @type 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 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
+);
+
+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
+);
+
+#keyset[id]
+while_expr_labels(
+  int id: @while_expr ref,
+  int label: @label ref
+);
+
+#keyset[id]
+while_expr_loop_bodies(
+  int id: @while_expr ref,
+  int loop_body: @block_expr 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
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
 );
 
-await_exprs(
-  unique int id: @await_expr,
-  int expr: @expr ref
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
 );
 
-become_exprs(
-  unique int id: @become_expr,
-  int expr: @expr ref
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
 );
 
-binary_exprs(
-  unique int id: @binary_expr,
-  int lhs: @expr ref,
-  int rhs: @expr ref
+#keyset[id]
+const_ties(
+  int id: @const ref,
+  int ty: @type ref
 );
 
 #keyset[id]
-binary_expr_ops(
-  int id: @binary_expr ref,
-  string op: string ref
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
 );
 
-@block_expr_base =
-  @async_block_expr
-| @block_expr
-| @unsafe_block_expr
-;
+enums(
+  unique int id: @enum
+);
 
 #keyset[id, index]
-block_expr_base_statements(
-  int id: @block_expr_base ref,
+enum_attrs(
+  int id: @enum ref,
   int index: int ref,
-  int statement: @stmt ref
+  int attr: @attr ref
 );
 
 #keyset[id]
-block_expr_base_tails(
-  int id: @block_expr_base ref,
-  int tail: @expr ref
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
 );
 
-box_exprs(
-  unique int id: @box_expr,
-  int expr: @expr ref
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
 );
 
-box_pats(
-  unique int id: @box_pat,
-  int inner: @pat ref
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
 );
 
-break_exprs(
-  unique int id: @break_expr
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
 );
 
 #keyset[id]
-break_expr_exprs(
-  int id: @break_expr ref,
-  int expr: @expr ref
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
 );
 
-#keyset[id]
-break_expr_labels(
-  int id: @break_expr ref,
-  int label: @label ref
+extern_blocks(
+  unique int id: @extern_block
 );
 
-call_exprs(
-  unique int id: @call_expr,
-  int callee: @expr ref
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
 );
 
 #keyset[id, index]
-call_expr_args(
-  int id: @call_expr ref,
+extern_block_attrs(
+  int id: @extern_block ref,
   int index: int ref,
-  int arg: @expr ref
+  int attr: @attr ref
 );
 
 #keyset[id]
-call_expr_is_assignee_expr(
-  int id: @call_expr ref
-);
-
-cast_exprs(
-  unique int id: @cast_expr,
-  int expr: @expr ref,
-  int type_: @type_ref ref
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
 );
 
-closure_exprs(
-  unique int id: @closure_expr,
-  int body: @expr ref,
-  string closure_kind: string ref
-);
-
-#keyset[id, index]
-closure_expr_args(
-  int id: @closure_expr ref,
-  int index: int ref,
-  int arg: @pat ref
+extern_crates(
+  unique int id: @extern_crate
 );
 
 #keyset[id, index]
-closure_expr_arg_types(
-  int id: @closure_expr ref,
+extern_crate_attrs(
+  int id: @extern_crate ref,
   int index: int ref,
-  int arg_type: @type_ref ref
+  int attr: @attr ref
 );
 
 #keyset[id]
-closure_expr_ret_types(
-  int id: @closure_expr ref,
-  int ret_type: @type_ref ref
+extern_crate_name_refs(
+  int id: @extern_crate ref,
+  int name_ref: @name_ref ref
 );
 
 #keyset[id]
-closure_expr_is_move(
-  int id: @closure_expr ref
-);
-
-const_block_pats(
-  unique int id: @const_block_pat,
-  int expr: @expr ref
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
 );
 
-const_exprs(
-  unique int id: @const_expr,
-  int expr: @expr ref
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
 );
 
-continue_exprs(
-  unique int id: @continue_expr
+fns(
+  unique int id: @fn
 );
 
 #keyset[id]
-continue_expr_labels(
-  int id: @continue_expr ref,
-  int label: @label ref
+fn_abis(
+  int id: @fn ref,
+  int abi: @abi ref
 );
 
-expr_stmts(
-  unique int id: @expr_stmt,
-  int expr: @expr ref
+#keyset[id, index]
+fn_attrs(
+  int id: @fn ref,
+  int index: int ref,
+  int attr: @attr ref
 );
 
 #keyset[id]
-expr_stmt_has_semicolon(
-  int id: @expr_stmt ref
+fn_bodies(
+  int id: @fn ref,
+  int body: @block_expr ref
 );
 
-field_exprs(
-  unique int id: @field_expr,
-  int expr: @expr ref,
-  string name: string ref
+#keyset[id]
+fn_generic_param_lists(
+  int id: @fn ref,
+  int generic_param_list: @generic_param_list ref
 );
 
-functions(
-  unique int id: @function,
-  string name: string ref,
-  int body: @expr ref
+#keyset[id]
+fn_names(
+  int id: @fn ref,
+  int name: @name ref
 );
 
-ident_pats(
-  unique int id: @ident_pat,
-  string binding_id: string ref
+#keyset[id]
+fn_param_lists(
+  int id: @fn ref,
+  int param_list: @param_list ref
 );
 
 #keyset[id]
-ident_pat_subpats(
-  int id: @ident_pat ref,
-  int subpat: @pat ref
+fn_ret_types(
+  int id: @fn ref,
+  int ret_type: @ret_type ref
 );
 
-if_exprs(
-  unique int id: @if_expr,
-  int condition: @expr ref,
-  int then: @expr ref
+#keyset[id]
+fn_visibilities(
+  int id: @fn ref,
+  int visibility: @visibility ref
 );
 
 #keyset[id]
-if_expr_elses(
-  int id: @if_expr ref,
-  int else: @expr ref
+fn_where_clauses(
+  int id: @fn ref,
+  int where_clause: @where_clause ref
 );
 
-index_exprs(
-  unique int id: @index_expr,
-  int base: @expr ref,
-  int index: @expr ref
+impls(
+  unique int id: @impl
 );
 
 #keyset[id]
-index_expr_is_assignee_expr(
-  int id: @index_expr ref
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
 );
 
-item_stmts(
-  unique int id: @item_stmt
-);
-
-let_exprs(
-  unique int id: @let_expr,
-  int pat: @pat ref,
-  int expr: @expr ref
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
 );
 
-let_stmts(
-  unique int id: @let_stmt,
-  int pat: @pat ref
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
 );
 
 #keyset[id]
-let_stmt_types(
-  int id: @let_stmt ref,
-  int type_: @type_ref ref
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type ref
 );
 
 #keyset[id]
-let_stmt_initializers(
-  int id: @let_stmt ref,
-  int initializer: @expr ref
+impl_traits(
+  int id: @impl ref,
+  int trait: @type ref
 );
 
 #keyset[id]
-let_stmt_elses(
-  int id: @let_stmt ref,
-  int else: @expr ref
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
 );
 
-literal_exprs(
-  unique int id: @literal_expr
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
 );
 
-literal_pats(
-  unique int id: @literal_pat,
-  int expr: @expr ref
+macro_calls(
+  unique int id: @macro_call
 );
 
-loop_exprs(
-  unique int id: @loop_expr,
-  int body: @expr ref
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
 );
 
 #keyset[id]
-loop_expr_labels(
-  int id: @loop_expr ref,
-  int label: @label ref
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
 );
 
-match_exprs(
-  unique int id: @match_expr,
-  int expr: @expr ref
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
 );
 
-#keyset[id, index]
-match_expr_branches(
-  int id: @match_expr ref,
-  int index: int ref,
-  int branch: @match_arm ref
+macro_defs(
+  unique int id: @macro_def
 );
 
-method_call_exprs(
-  unique int id: @method_call_expr,
-  int receiver: @expr ref,
-  string method_name: string ref
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
 );
 
 #keyset[id, index]
-method_call_expr_args(
-  int id: @method_call_expr ref,
+macro_def_attrs(
+  int id: @macro_def ref,
   int index: int ref,
-  int arg: @expr ref
+  int attr: @attr ref
 );
 
 #keyset[id]
-method_call_expr_generic_args(
-  int id: @method_call_expr ref,
-  int generic_args: @generic_arg_list ref
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
 );
 
-missing_exprs(
-  unique int id: @missing_expr
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
 );
 
-missing_pats(
-  unique int id: @missing_pat
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
 );
 
-modules(
-  unique int id: @module
+macro_rules(
+  unique int id: @macro_rules
 );
 
 #keyset[id, index]
-module_declarations(
-  int id: @module ref,
+macro_rules_attrs(
+  int id: @macro_rules ref,
   int index: int ref,
-  int declaration: @declaration ref
+  int attr: @attr ref
 );
 
-offset_of_exprs(
-  unique int id: @offset_of_expr,
-  int container: @type_ref ref
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
 );
 
-#keyset[id, index]
-offset_of_expr_fields(
-  int id: @offset_of_expr ref,
-  int index: int ref,
-  string field: string ref
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
 );
 
-or_pats(
-  unique int id: @or_pat
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+modules(
+  unique int id: @module
 );
 
 #keyset[id, index]
-or_pat_args(
-  int id: @or_pat ref,
+module_attrs(
+  int id: @module ref,
   int index: int ref,
-  int arg: @pat ref
+  int attr: @attr ref
 );
 
-path_exprs(
-  unique int id: @path_expr,
-  int path: @path ref
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
 );
 
-path_pats(
-  unique int id: @path_pat,
-  int path: @path ref
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
 );
 
-prefix_exprs(
-  unique int id: @prefix_expr,
-  int expr: @expr ref,
-  string op: string ref
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
 );
 
-range_exprs(
-  unique int id: @range_expr
+statics(
+  unique int id: @static
 );
 
-#keyset[id]
-range_expr_lhs(
-  int id: @range_expr ref,
-  int lhs: @expr ref
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
 );
 
 #keyset[id]
-range_expr_rhs(
-  int id: @range_expr ref,
-  int rhs: @expr ref
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
 );
 
 #keyset[id]
-range_expr_is_inclusive(
-  int id: @range_expr ref
-);
-
-range_pats(
-  unique int id: @range_pat
+static_names(
+  int id: @static ref,
+  int name: @name ref
 );
 
 #keyset[id]
-range_pat_starts(
-  int id: @range_pat ref,
-  int start: @pat ref
+static_ties(
+  int id: @static ref,
+  int ty: @type ref
 );
 
 #keyset[id]
-range_pat_ends(
-  int id: @range_pat ref,
-  int end: @pat ref
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
 );
 
-record_exprs(
-  unique int id: @record_expr
-);
-
-#keyset[id]
-record_expr_paths(
-  int id: @record_expr ref,
-  int path: @path ref
+structs(
+  unique int id: @struct
 );
 
 #keyset[id, index]
-record_expr_flds(
-  int id: @record_expr ref,
+struct_attrs(
+  int id: @struct ref,
   int index: int ref,
-  int fld: @record_expr_field ref
+  int attr: @attr ref
 );
 
 #keyset[id]
-record_expr_spreads(
-  int id: @record_expr ref,
-  int spread: @expr ref
+struct_field_lists(
+  int id: @struct ref,
+  int field_list: @field_list ref
 );
 
 #keyset[id]
-record_expr_has_ellipsis(
-  int id: @record_expr ref
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
 );
 
 #keyset[id]
-record_expr_is_assignee_expr(
-  int id: @record_expr ref
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
 );
 
-record_pats(
-  unique int id: @record_pat
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
 );
 
 #keyset[id]
-record_pat_paths(
-  int id: @record_pat ref,
-  int path: @path ref
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
 );
 
-#keyset[id, index]
-record_pat_flds(
-  int id: @record_pat ref,
-  int index: int ref,
-  int fld: @record_pat_field ref
+traits(
+  unique int id: @trait
 );
 
 #keyset[id]
-record_pat_has_ellipsis(
-  int id: @record_pat ref
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
 );
 
-ref_exprs(
-  unique int id: @ref_expr,
-  int expr: @expr ref
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
 );
 
 #keyset[id]
-ref_expr_is_raw(
-  int id: @ref_expr ref
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
 );
 
 #keyset[id]
-ref_expr_is_mut(
-  int id: @ref_expr ref
-);
-
-ref_pats(
-  unique int id: @ref_pat,
-  int pat: @pat ref
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
 );
 
 #keyset[id]
-ref_pat_is_mut(
-  int id: @ref_pat ref
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
 );
 
-return_exprs(
-  unique int id: @return_expr
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
 );
 
 #keyset[id]
-return_expr_exprs(
-  int id: @return_expr ref,
-  int expr: @expr ref
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
 );
 
-slice_pats(
-  unique int id: @slice_pat
+trait_aliases(
+  unique int id: @trait_alias
 );
 
 #keyset[id, index]
-slice_pat_prefixes(
-  int id: @slice_pat ref,
+trait_alias_attrs(
+  int id: @trait_alias ref,
   int index: int ref,
-  int prefix: @pat ref
+  int attr: @attr ref
 );
 
 #keyset[id]
-slice_pat_slice(
-  int id: @slice_pat ref,
-  int slice: @pat ref
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
 );
 
-#keyset[id, index]
-slice_pat_suffixes(
-  int id: @slice_pat ref,
-  int index: int ref,
-  int suffix: @pat ref
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
 );
 
-tuple_exprs(
-  unique int id: @tuple_expr
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
 );
 
-#keyset[id, index]
-tuple_expr_exprs(
-  int id: @tuple_expr ref,
-  int index: int ref,
-  int expr: @expr ref
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
 );
 
 #keyset[id]
-tuple_expr_is_assignee_expr(
-  int id: @tuple_expr ref
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
 );
 
-tuple_pats(
-  unique int id: @tuple_pat
+type_aliases(
+  unique int id: @type_alias
 );
 
 #keyset[id, index]
-tuple_pat_args(
-  int id: @tuple_pat ref,
+type_alias_attrs(
+  int id: @type_alias ref,
   int index: int ref,
-  int arg: @pat ref
+  int attr: @attr ref
 );
 
 #keyset[id]
-tuple_pat_ellipsis_indices(
-  int id: @tuple_pat ref,
-  int ellipsis_index: int ref
-);
-
-tuple_struct_pats(
-  unique int id: @tuple_struct_pat
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
 );
 
 #keyset[id]
-tuple_struct_pat_paths(
-  int id: @tuple_struct_pat ref,
-  int path: @path ref
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
 );
 
-#keyset[id, index]
-tuple_struct_pat_args(
-  int id: @tuple_struct_pat ref,
-  int index: int ref,
-  int arg: @pat ref
+#keyset[id]
+type_alias_ties(
+  int id: @type_alias ref,
+  int ty: @type ref
 );
 
 #keyset[id]
-tuple_struct_pat_ellipsis_indices(
-  int id: @tuple_struct_pat ref,
-  int ellipsis_index: int ref
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
 );
 
-underscore_exprs(
-  unique int id: @underscore_expr
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
 );
 
-unimplemented_declarations(
-  unique int id: @unimplemented_declaration
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
 );
 
-wildcard_pats(
-  unique int id: @wildcard_pat
+unions(
+  unique int id: @union
 );
 
-yeet_exprs(
-  unique int id: @yeet_expr
+#keyset[id, index]
+union_attrs(
+  int id: @union 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
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
 );
 
 #keyset[id]
-yield_expr_exprs(
-  int id: @yield_expr ref,
-  int expr: @expr ref
+union_names(
+  int id: @union ref,
+  int name: @name ref
 );
 
-async_block_exprs(
-  unique int id: @async_block_expr
+#keyset[id]
+union_record_field_lists(
+  int id: @union ref,
+  int record_field_list: @record_field_list ref
 );
 
-block_exprs(
-  unique int id: @block_expr
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
 );
 
 #keyset[id]
-block_expr_labels(
-  int id: @block_expr ref,
-  int label: @label ref
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
 );
 
-element_list_exprs(
-  unique int id: @element_list_expr
+uses(
+  unique int id: @use
 );
 
 #keyset[id, index]
-element_list_expr_elements(
-  int id: @element_list_expr ref,
+use_attrs(
+  int id: @use ref,
   int index: int ref,
-  int element: @expr ref
+  int attr: @attr ref
 );
 
 #keyset[id]
-element_list_expr_is_assignee_expr(
-  int id: @element_list_expr ref
-);
-
-repeat_exprs(
-  unique int id: @repeat_expr,
-  int initializer: @expr ref,
-  int repeat: @expr ref
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
 );
 
-unsafe_block_exprs(
-  unique int id: @unsafe_block_expr
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
 );
diff --git a/rust/ql/lib/rust.dbscheme.stats b/rust/ql/lib/rust.dbscheme.stats
deleted file mode 100644
index 9995467e33e54..0000000000000
--- a/rust/ql/lib/rust.dbscheme.stats
+++ /dev/null
@@ -1,4 +0,0 @@
-<dbstats>
-     <typesizes />
-     <stats />
-</dbstats>
diff --git a/rust/ql/lib/rust.qll b/rust/ql/lib/rust.qll
deleted file mode 100644
index bdb9f3df374cc..0000000000000
--- a/rust/ql/lib/rust.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-/** Top-level import for the Rust language pack */
-
-import codeql.rust.elements
-import codeql.Locations
-import codeql.files.FileSystem
diff --git a/rust/ql/test/extractor-tests/generated/.generated_tests.list b/rust/ql/test/extractor-tests/generated/.generated_tests.list
index d5ec5ccad94d4..e69de29bb2d1d 100644
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -1,61 +0,0 @@
-AsmExpr/gen_asm_expr.rs 00b21fd66fe12785174bd0160d0317a6c78ff05dbba73313eb07b56531cf3158 00b21fd66fe12785174bd0160d0317a6c78ff05dbba73313eb07b56531cf3158
-AsyncBlockExpr/gen_async_block_expr.rs e608c67564863c969d512fea8df22f3b9556c4f8bd5582a04da2629388511591 e608c67564863c969d512fea8df22f3b9556c4f8bd5582a04da2629388511591
-AwaitExpr/gen_await_expr.rs cbfa17a0b84bb0033b1f577c1f2a7ff187506c6211faaf6d90c371d4186b9aa2 cbfa17a0b84bb0033b1f577c1f2a7ff187506c6211faaf6d90c371d4186b9aa2
-BecomeExpr/gen_become_expr.rs 190e22230ca2fcb9506b9821ff6fe67c48f7d30dd1653fc3f6434440e4c2eb3a 190e22230ca2fcb9506b9821ff6fe67c48f7d30dd1653fc3f6434440e4c2eb3a
-BinaryExpr/gen_binary_expr.rs 5ea68396dc2e3ff7fcaf5a5201636dd175dd45be36647b6ae0043c765ce24549 5ea68396dc2e3ff7fcaf5a5201636dd175dd45be36647b6ae0043c765ce24549
-BlockExpr/gen_block_expr.rs 17b06c726e304e0efcfde8e71afd9c657860312be554366894236125cb08719e 17b06c726e304e0efcfde8e71afd9c657860312be554366894236125cb08719e
-BoxExpr/gen_box_expr.rs f3a121bdb82794d223a294e2fcb67f9d5c77aff5f4f5be8c4673e2bed0e694d8 f3a121bdb82794d223a294e2fcb67f9d5c77aff5f4f5be8c4673e2bed0e694d8
-BoxPat/gen_box_pat.rs 1493e24b732370b577ade38c47db17fa157df19f5390606a67a6040e49b501c0 1493e24b732370b577ade38c47db17fa157df19f5390606a67a6040e49b501c0
-BreakExpr/gen_break_expr.rs 5240475a75b772ea45ab5a9d4f09a8fbba4a9d3e6cd8483fc2d0de29c880eac8 5240475a75b772ea45ab5a9d4f09a8fbba4a9d3e6cd8483fc2d0de29c880eac8
-CallExpr/gen_call_expr.rs 013a7c878996aefb25b94b68eebc4f0b1bb74ccd09e91c491980817a383e2401 013a7c878996aefb25b94b68eebc4f0b1bb74ccd09e91c491980817a383e2401
-CastExpr/gen_cast_expr.rs abd59cc7b92578b56098ac0045cf7de4b15c645cce79e3bdad8d3b6f4657360d abd59cc7b92578b56098ac0045cf7de4b15c645cce79e3bdad8d3b6f4657360d
-ClosureExpr/gen_closure_expr.rs 15bd9abdb8aaffabb8bb335f8ebd0571eb5f29115e1dc8d11837aa988702cd80 15bd9abdb8aaffabb8bb335f8ebd0571eb5f29115e1dc8d11837aa988702cd80
-ConstBlockPat/gen_const_block_pat.rs 7e3057cd24d22e752354369cf7e08e9536642812c0947b36aa5d8290a45476fd 7e3057cd24d22e752354369cf7e08e9536642812c0947b36aa5d8290a45476fd
-ConstExpr/gen_const_expr.rs d9c261139d784ad5efd6ca384528c6f2296392932d0284ae4d0e63844e94a091 d9c261139d784ad5efd6ca384528c6f2296392932d0284ae4d0e63844e94a091
-ContinueExpr/gen_continue_expr.rs 63840dcd8440aaf1b96b713b80eb2b56acb1639d3200b3c732b45291a071b5ff 63840dcd8440aaf1b96b713b80eb2b56acb1639d3200b3c732b45291a071b5ff
-ElementListExpr/gen_element_list_expr.rs 3edce2774071165be5023a34ea7162f40d5dfb738b2b263fefa99fca026f89ee 3edce2774071165be5023a34ea7162f40d5dfb738b2b263fefa99fca026f89ee
-ExprStmt/gen_expr_stmt.rs 318a0fd72ee8d6da17c5d635ba0724ed2c11c0f7e9b75c939990cd0c7f3929e4 318a0fd72ee8d6da17c5d635ba0724ed2c11c0f7e9b75c939990cd0c7f3929e4
-FieldExpr/gen_field_expr.rs 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b
-Function/gen_function.rs ba6ecb9e0d89183295eb02f3c20ebbf5c209f89bd0172c73a3b4a6dacbf3a54c ba6ecb9e0d89183295eb02f3c20ebbf5c209f89bd0172c73a3b4a6dacbf3a54c
-GenericArgList/gen_generic_arg_list.rs cfb072d3b48f9dd568c23d4dfefba28766628678f66bbf9a436de9919ead35f5 cfb072d3b48f9dd568c23d4dfefba28766628678f66bbf9a436de9919ead35f5
-IdentPat/gen_ident_pat.rs 87f9201ca47683ff6f12a0c844c062fdedb6d86546794522d358b117ba0fe477 87f9201ca47683ff6f12a0c844c062fdedb6d86546794522d358b117ba0fe477
-IfExpr/gen_if_expr.rs f2f79d4df0f01dc691b5c62c0f9e1815d7ebc978cf83b7559b5eeab0fcc2fc01 f2f79d4df0f01dc691b5c62c0f9e1815d7ebc978cf83b7559b5eeab0fcc2fc01
-IndexExpr/gen_index_expr.rs 22d7f81ba43dc63f1f49e21a2c25ce25a1b8f6e8e95e1a66f518f010a4d73c61 22d7f81ba43dc63f1f49e21a2c25ce25a1b8f6e8e95e1a66f518f010a4d73c61
-Label/gen_label.rs 0584f519f210f621d7ebc0cb8c95ce05db0795d6109c0d16866f8f699a28213c 0584f519f210f621d7ebc0cb8c95ce05db0795d6109c0d16866f8f699a28213c
-LetExpr/gen_let_expr.rs 7aebcd7197fd0e6b5b954deb2f6380769c94609c57e34eb86a33eb04e91d4a78 7aebcd7197fd0e6b5b954deb2f6380769c94609c57e34eb86a33eb04e91d4a78
-LetStmt/gen_let_stmt.rs 3f41c9721149ee0bf8f89a58bc419756358a2e267b80d07660354a7fc44ef1eb 3f41c9721149ee0bf8f89a58bc419756358a2e267b80d07660354a7fc44ef1eb
-LiteralExpr/gen_literal_expr.rs 2db01ad390e5c0c63a957c043230a462cb4cc25715eea6ede15d43c55d35976d 2db01ad390e5c0c63a957c043230a462cb4cc25715eea6ede15d43c55d35976d
-LiteralPat/gen_literal_pat.rs a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3 a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3
-LoopExpr/gen_loop_expr.rs 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619
-MatchArm/gen_match_arm.rs ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5 ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5
-MatchExpr/gen_match_expr.rs 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0
-MethodCallExpr/gen_method_call_expr.rs f2b4679eb1ec095981fe6bd656b632c22bf6bd0da133309da3f7ef5bd1ab4b5d f2b4679eb1ec095981fe6bd656b632c22bf6bd0da133309da3f7ef5bd1ab4b5d
-MissingExpr/gen_missing_expr.rs 5f7d398068d98b8e3a8fef6b4009b58e7816e8c0c4467b3567472799fc31bb18 5f7d398068d98b8e3a8fef6b4009b58e7816e8c0c4467b3567472799fc31bb18
-MissingPat/gen_missing_pat.rs 925e789e16d048f140886b22d3da5b75f871287f355f978cfd03b5fc3f319a32 925e789e16d048f140886b22d3da5b75f871287f355f978cfd03b5fc3f319a32
-Module/gen_module.rs 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1
-OffsetOfExpr/gen_offset_of_expr.rs 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934
-OrPat/gen_or_pat.rs 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56
-Path/gen_path.rs e32637d04445d5b9411086f3ad5d8b41de24327f7ad641d1a1a25c1d160121c8 e32637d04445d5b9411086f3ad5d8b41de24327f7ad641d1a1a25c1d160121c8
-PathExpr/gen_path_expr.rs a1e0ececfe62a63a43583c9bd8064a80a90c042c55bac29d86776c0c6559f33a a1e0ececfe62a63a43583c9bd8064a80a90c042c55bac29d86776c0c6559f33a
-PathPat/gen_path_pat.rs fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371 fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371
-PrefixExpr/gen_prefix_expr.rs 2b7c6eb7efe5b1bbf895dde386eca9e1c4dcfa047ca141628580c97ec304ac4a 2b7c6eb7efe5b1bbf895dde386eca9e1c4dcfa047ca141628580c97ec304ac4a
-RangeExpr/gen_range_expr.rs 3f27cff9cc76b2703beff622d1453b84121e1970a869e45f9428deac92c4ecb0 3f27cff9cc76b2703beff622d1453b84121e1970a869e45f9428deac92c4ecb0
-RangePat/gen_range_pat.rs 18b5169c3ab9230c95d86c4897f8343b2176d9602c9ea371c70c1eb0dbf89a28 18b5169c3ab9230c95d86c4897f8343b2176d9602c9ea371c70c1eb0dbf89a28
-RecordExpr/gen_record_expr.rs f8a7db88ae9e2a47588d26a76331cba64014dc6d5e065af28adcd718c8c52727 f8a7db88ae9e2a47588d26a76331cba64014dc6d5e065af28adcd718c8c52727
-RecordExprField/gen_record_expr_field.rs ea34f9fc64a600a5fff6b3388a2f89990bc9381937f49e83ce5f8192a14a0e4f ea34f9fc64a600a5fff6b3388a2f89990bc9381937f49e83ce5f8192a14a0e4f
-RecordPat/gen_record_pat.rs a7e8aafb51532785459467e82d175a4cbab7ad5757cd00d74a0b1b673a5f21d9 a7e8aafb51532785459467e82d175a4cbab7ad5757cd00d74a0b1b673a5f21d9
-RecordPatField/gen_record_pat_field.rs f6c31bd08e6021aa4da6e8238561a77208f0ef723c5e217c6fbc16b8aec73a84 f6c31bd08e6021aa4da6e8238561a77208f0ef723c5e217c6fbc16b8aec73a84
-RefExpr/gen_ref_expr.rs 82695467551def4a00c78aa1ea6a1460e9edbef7df2672f13daccb0ee5d6b4c6 82695467551def4a00c78aa1ea6a1460e9edbef7df2672f13daccb0ee5d6b4c6
-RefPat/gen_ref_pat.rs aba7518649d9a37928e59a40d42f76cc0f4735e8daf711a3def6d2f0520e1f54 aba7518649d9a37928e59a40d42f76cc0f4735e8daf711a3def6d2f0520e1f54
-RepeatExpr/gen_repeat_expr.rs 36d8ee353f3115ca99a6b070d174b971e9440e73038489ee571e408c354fecf8 36d8ee353f3115ca99a6b070d174b971e9440e73038489ee571e408c354fecf8
-ReturnExpr/gen_return_expr.rs 4f6ef29d7b3c60d6d71d1a6034a0721671f517428ba21897361a92b01009d38f 4f6ef29d7b3c60d6d71d1a6034a0721671f517428ba21897361a92b01009d38f
-SlicePat/gen_slice_pat.rs df4a6692f5100aa11dd777561400ce71e37b85f2363b0638c21975a1771b15d5 df4a6692f5100aa11dd777561400ce71e37b85f2363b0638c21975a1771b15d5
-TupleExpr/gen_tuple_expr.rs 8ecd1b6ecc58a0319eed434a423cc6f41bdf1901b1950e6e79735d7f7b2f8374 8ecd1b6ecc58a0319eed434a423cc6f41bdf1901b1950e6e79735d7f7b2f8374
-TuplePat/gen_tuple_pat.rs b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148 b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148
-TupleStructPat/gen_tuple_struct_pat.rs 601ca8813272d15b4c8fd7402d0d28a42a62be82865eb5e86b985ad31464ca98 601ca8813272d15b4c8fd7402d0d28a42a62be82865eb5e86b985ad31464ca98
-TypeRef/gen_type_ref.rs d9a3ebe221015919dd0422545397c64865f7fad4987ab09be2124029bbb7fcc3 d9a3ebe221015919dd0422545397c64865f7fad4987ab09be2124029bbb7fcc3
-UnderscoreExpr/gen_underscore_expr.rs fe34e99d322bf86c0f5509c9b5fd6e1e8abbdf63dbe7e01687344a41e9aabe52 fe34e99d322bf86c0f5509c9b5fd6e1e8abbdf63dbe7e01687344a41e9aabe52
-UnsafeBlockExpr/gen_unsafe_block_expr.rs 4f995811d788098a86470645957803310a8d87f7974aebe6e67073230977566f 4f995811d788098a86470645957803310a8d87f7974aebe6e67073230977566f
-WildcardPat/gen_wildcard_pat.rs f1b175eeb3a0fc32bbcfb70a207be33dfde51a7d5198f72b8e08948f0d43e3dc f1b175eeb3a0fc32bbcfb70a207be33dfde51a7d5198f72b8e08948f0d43e3dc
-YeetExpr/gen_yeet_expr.rs c243b785a2cbd941bcec23dafc23ffbc64b93cf2843b6ede9783cdb81fed439d c243b785a2cbd941bcec23dafc23ffbc64b93cf2843b6ede9783cdb81fed439d
-YieldExpr/gen_yield_expr.rs 20f607719ff90bbcd831fe48a530400d0774394867ae65618cd1671d638f853e 20f607719ff90bbcd831fe48a530400d0774394867ae65618cd1671d638f853e
diff --git a/rust/ql/test/extractor-tests/generated/.gitattributes b/rust/ql/test/extractor-tests/generated/.gitattributes
index 1c0da518b29e7..f817726ad169f 100644
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -1,63 +1,2 @@
 /.generated_tests.list linguist-generated
 /.gitattributes linguist-generated
-/AsmExpr/gen_asm_expr.rs linguist-generated
-/AsyncBlockExpr/gen_async_block_expr.rs linguist-generated
-/AwaitExpr/gen_await_expr.rs linguist-generated
-/BecomeExpr/gen_become_expr.rs linguist-generated
-/BinaryExpr/gen_binary_expr.rs linguist-generated
-/BlockExpr/gen_block_expr.rs linguist-generated
-/BoxExpr/gen_box_expr.rs linguist-generated
-/BoxPat/gen_box_pat.rs linguist-generated
-/BreakExpr/gen_break_expr.rs linguist-generated
-/CallExpr/gen_call_expr.rs linguist-generated
-/CastExpr/gen_cast_expr.rs linguist-generated
-/ClosureExpr/gen_closure_expr.rs linguist-generated
-/ConstBlockPat/gen_const_block_pat.rs linguist-generated
-/ConstExpr/gen_const_expr.rs linguist-generated
-/ContinueExpr/gen_continue_expr.rs linguist-generated
-/ElementListExpr/gen_element_list_expr.rs linguist-generated
-/ExprStmt/gen_expr_stmt.rs linguist-generated
-/FieldExpr/gen_field_expr.rs linguist-generated
-/Function/gen_function.rs linguist-generated
-/GenericArgList/gen_generic_arg_list.rs linguist-generated
-/IdentPat/gen_ident_pat.rs linguist-generated
-/IfExpr/gen_if_expr.rs linguist-generated
-/IndexExpr/gen_index_expr.rs linguist-generated
-/Label/gen_label.rs linguist-generated
-/LetExpr/gen_let_expr.rs linguist-generated
-/LetStmt/gen_let_stmt.rs linguist-generated
-/LiteralExpr/gen_literal_expr.rs linguist-generated
-/LiteralPat/gen_literal_pat.rs linguist-generated
-/LoopExpr/gen_loop_expr.rs linguist-generated
-/MatchArm/gen_match_arm.rs linguist-generated
-/MatchExpr/gen_match_expr.rs linguist-generated
-/MethodCallExpr/gen_method_call_expr.rs linguist-generated
-/MissingExpr/gen_missing_expr.rs linguist-generated
-/MissingPat/gen_missing_pat.rs linguist-generated
-/Module/gen_module.rs linguist-generated
-/OffsetOfExpr/gen_offset_of_expr.rs linguist-generated
-/OrPat/gen_or_pat.rs linguist-generated
-/Path/gen_path.rs linguist-generated
-/PathExpr/gen_path_expr.rs linguist-generated
-/PathPat/gen_path_pat.rs linguist-generated
-/PrefixExpr/gen_prefix_expr.rs linguist-generated
-/RangeExpr/gen_range_expr.rs linguist-generated
-/RangePat/gen_range_pat.rs linguist-generated
-/RecordExpr/gen_record_expr.rs linguist-generated
-/RecordExprField/gen_record_expr_field.rs linguist-generated
-/RecordPat/gen_record_pat.rs linguist-generated
-/RecordPatField/gen_record_pat_field.rs linguist-generated
-/RefExpr/gen_ref_expr.rs linguist-generated
-/RefPat/gen_ref_pat.rs linguist-generated
-/RepeatExpr/gen_repeat_expr.rs linguist-generated
-/ReturnExpr/gen_return_expr.rs linguist-generated
-/SlicePat/gen_slice_pat.rs linguist-generated
-/TupleExpr/gen_tuple_expr.rs linguist-generated
-/TuplePat/gen_tuple_pat.rs linguist-generated
-/TupleStructPat/gen_tuple_struct_pat.rs linguist-generated
-/TypeRef/gen_type_ref.rs linguist-generated
-/UnderscoreExpr/gen_underscore_expr.rs linguist-generated
-/UnsafeBlockExpr/gen_unsafe_block_expr.rs linguist-generated
-/WildcardPat/gen_wildcard_pat.rs linguist-generated
-/YeetExpr/gen_yeet_expr.rs linguist-generated
-/YieldExpr/gen_yield_expr.rs linguist-generated
diff --git a/rust/ql/test/extractor-tests/generated/Abi/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Abi/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Abi/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ArgList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ArgList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArgList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ArrayExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ArrayType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
deleted file mode 100644
index 44831a8693d1b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_asm_expr.rs:6:9:6:24 | AsmExpr | getExpr: | gen_asm_expr.rs:6:23:6:23 | UnderscoreExpr |
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
deleted file mode 100644
index be56bdf712eef..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from AsmExpr x, Expr getExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/AsmExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/gen_asm_expr.rs b/rust/ql/test/extractor-tests/generated/AsmExpr/gen_asm_expr.rs
deleted file mode 100644
index cfd6896e2f841..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/gen_asm_expr.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_asm_expr() -> () {
-    // An inline assembly expression. For example:
-    unsafe {
-        builtin # asm(_);
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/AssocItemList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/AssocItemList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocItemList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/AssocTypeArg/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.expected b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.expected
deleted file mode 100644
index 1cd82381fb4fd..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_async_block_expr.rs:5:5:8:5 | AsyncBlockExpr | getNumberOfStatements: | 1 | hasTail: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.ql b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.ql
deleted file mode 100644
index f81e395a73b18..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from AsyncBlockExpr x, int getNumberOfStatements, string hasTail
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfStatements = x.getNumberOfStatements() and
-  if x.hasTail() then hasTail = "yes" else hasTail = "no"
-select x, "getNumberOfStatements:", getNumberOfStatements, "hasTail:", hasTail
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.expected b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.expected
deleted file mode 100644
index d9c3f9a68979e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_async_block_expr.rs:5:5:8:5 | AsyncBlockExpr | 0 | gen_async_block_expr.rs:6:12:6:12 | LetStmt |
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql
deleted file mode 100644
index 0a5058e5ac04a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from AsyncBlockExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getStatement(index)
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.expected b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.expected
deleted file mode 100644
index 66ead87e31223..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_async_block_expr.rs:5:5:8:5 | AsyncBlockExpr | gen_async_block_expr.rs:7:8:7:8 | PathExpr |
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.ql b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.ql
deleted file mode 100644
index 6feb1237027e2..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from AsyncBlockExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTail()
diff --git a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/gen_async_block_expr.rs b/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/gen_async_block_expr.rs
deleted file mode 100644
index 18f5e33f77eff..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AsyncBlockExpr/gen_async_block_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_async_block_expr() -> i32 {
-    // An async block expression. For example:
-    async {
-       let x = 42;
-       x
-    }.await
-}
diff --git a/rust/ql/test/extractor-tests/generated/Attr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Attr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Attr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected
deleted file mode 100644
index df585132030cd..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_await_expr.rs:6:17:6:27 | AwaitExpr | getExpr: | gen_await_expr.rs:6:17:6:21 | CallExpr |
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql
deleted file mode 100644
index 6039b921e90e7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from AwaitExpr x, Expr getExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/AwaitExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/gen_await_expr.rs b/rust/ql/test/extractor-tests/generated/AwaitExpr/gen_await_expr.rs
deleted file mode 100644
index 6bdc5a1ca2fc6..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AwaitExpr/gen_await_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_await_expr() -> () {
-    // An `await` expression. For example:
-    async {
-        let x = foo().await;
-        x
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected
deleted file mode 100644
index f067a46ca8d7c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_become_expr.rs:8:10:8:36 | BecomeExpr | getExpr: | gen_become_expr.rs:8:17:8:36 | CallExpr |
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql
deleted file mode 100644
index b98b67f97f3c2..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BecomeExpr x, Expr getExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/BecomeExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/gen_become_expr.rs b/rust/ql/test/extractor-tests/generated/BecomeExpr/gen_become_expr.rs
deleted file mode 100644
index 4dd90c1812ea9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BecomeExpr/gen_become_expr.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-
-// A `become` expression. For example:
-fn fact_a(n: i32, a: i32) -> i32 {
-     if n == 0 {
-         a
-     } else {
-         become fact_a(n - 1, n * a)
-     }
- }    ```
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected
deleted file mode 100644
index 7523e3df01c97..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| gen_binary_expr.rs:5:5:5:9 | BinaryExpr | getLhs: | gen_binary_expr.rs:5:5:5:5 | PathExpr | getRhs: | gen_binary_expr.rs:5:9:5:9 | PathExpr | hasOp: | yes |
-| gen_binary_expr.rs:6:5:6:10 | BinaryExpr | getLhs: | gen_binary_expr.rs:6:5:6:5 | PathExpr | getRhs: | gen_binary_expr.rs:6:10:6:10 | PathExpr | hasOp: | yes |
-| gen_binary_expr.rs:7:5:7:10 | BinaryExpr | getLhs: | gen_binary_expr.rs:7:5:7:5 | PathExpr | getRhs: | gen_binary_expr.rs:7:10:7:10 | PathExpr | hasOp: | yes |
-| gen_binary_expr.rs:8:5:8:9 | BinaryExpr | getLhs: | gen_binary_expr.rs:8:5:8:5 | PathExpr | getRhs: | gen_binary_expr.rs:8:9:8:9 | PathExpr | hasOp: | yes |
-| gen_binary_expr.rs:9:5:9:10 | BinaryExpr | getLhs: | gen_binary_expr.rs:9:5:9:5 | PathExpr | getRhs: | gen_binary_expr.rs:9:10:9:10 | PathExpr | hasOp: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql
deleted file mode 100644
index adbd8dcbdb6b3..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BinaryExpr x, Expr getLhs, Expr getRhs, string hasOp
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getLhs = x.getLhs() and
-  getRhs = x.getRhs() and
-  if x.hasOp() then hasOp = "yes" else hasOp = "no"
-select x, "getLhs:", getLhs, "getRhs:", getRhs, "hasOp:", hasOp
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.expected b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.expected
deleted file mode 100644
index 9f9e191f660a7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| gen_binary_expr.rs:5:5:5:9 | BinaryExpr | + |
-| gen_binary_expr.rs:6:5:6:10 | BinaryExpr | && |
-| gen_binary_expr.rs:7:5:7:10 | BinaryExpr | <= |
-| gen_binary_expr.rs:8:5:8:9 | BinaryExpr | = |
-| gen_binary_expr.rs:9:5:9:10 | BinaryExpr | += |
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql
deleted file mode 100644
index 955f1552c1e4e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BinaryExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getOp()
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/BinaryExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/BinaryExpr/gen_binary_expr.rs b/rust/ql/test/extractor-tests/generated/BinaryExpr/gen_binary_expr.rs
deleted file mode 100644
index 6e5ff4a36dc19..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/gen_binary_expr.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_binary_expr() -> () {
-    // A binary operation expression. For example:
-    x + y;
-    x && y;
-    x <= y;
-    x = y;
-    x += y;
-}
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
deleted file mode 100644
index 348f98b730ba9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| gen_block_expr.rs:3:28:12:1 | BlockExpr | getNumberOfStatements: | 1 | hasTail: | yes | hasLabel: | no |
-| gen_block_expr.rs:5:5:7:5 | BlockExpr | getNumberOfStatements: | 1 | hasTail: | no | hasLabel: | no |
-| gen_block_expr.rs:8:5:11:5 | BlockExpr | getNumberOfStatements: | 1 | hasTail: | yes | hasLabel: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
deleted file mode 100644
index 9cd6c27688aad..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BlockExpr x, int getNumberOfStatements, string hasTail, string hasLabel
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfStatements = x.getNumberOfStatements() and
-  (if x.hasTail() then hasTail = "yes" else hasTail = "no") and
-  if x.hasLabel() then hasLabel = "yes" else hasLabel = "no"
-select x, "getNumberOfStatements:", getNumberOfStatements, "hasTail:", hasTail, "hasLabel:",
-  hasLabel
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.expected
deleted file mode 100644
index 3a935228e0511..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_block_expr.rs:8:5:11:5 | BlockExpr | gen_block_expr.rs:8:5:8:11 | Label |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.ql b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.ql
deleted file mode 100644
index 25f432e2a9900..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BlockExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getLabel()
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.expected
deleted file mode 100644
index 66dc93e503df0..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| gen_block_expr.rs:3:28:12:1 | BlockExpr | 0 | gen_block_expr.rs:5:5:7:5 | ExprStmt |
-| gen_block_expr.rs:5:5:7:5 | BlockExpr | 0 | gen_block_expr.rs:6:13:6:13 | LetStmt |
-| gen_block_expr.rs:8:5:11:5 | BlockExpr | 0 | gen_block_expr.rs:9:13:9:13 | LetStmt |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql
deleted file mode 100644
index 13a94844bf2e7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BlockExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getStatement(index)
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.expected
deleted file mode 100644
index 2a3d8031821cd..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_block_expr.rs:3:28:12:1 | BlockExpr | gen_block_expr.rs:8:5:11:5 | BlockExpr |
-| gen_block_expr.rs:8:5:11:5 | BlockExpr | gen_block_expr.rs:10:9:10:9 | PathExpr |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.ql b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.ql
deleted file mode 100644
index b27adc54bb8ac..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getTail.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BlockExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTail()
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/BlockExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/gen_block_expr.rs b/rust/ql/test/extractor-tests/generated/BlockExpr/gen_block_expr.rs
deleted file mode 100644
index fe8bc6705e274..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/gen_block_expr.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_block_expr() -> () {
-    // A block expression. For example:
-    {
-        let x = 42;
-    }
-    'label: {
-        let x = 42;
-        x
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.expected b/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.expected
deleted file mode 100644
index b3324e400f5d8..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_box_expr.rs:5:13:5:37 | BoxExpr | getExpr: | gen_box_expr.rs:5:35:5:36 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.ql b/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.ql
deleted file mode 100644
index 5ca82028931bd..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BoxExpr x, Expr getExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
diff --git a/rust/ql/test/extractor-tests/generated/BoxExpr/gen_box_expr.rs b/rust/ql/test/extractor-tests/generated/BoxExpr/gen_box_expr.rs
deleted file mode 100644
index 1404d99f7582c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BoxExpr/gen_box_expr.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_box_expr() -> () {
-    // A box expression. For example:
-    let x = #[rustc_box] Box::new(42);
-}
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected
deleted file mode 100644
index 41597634b9518..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_box_pat.rs:6:9:6:27 | BoxPat | getInner: | gen_box_pat.rs:6:13:6:27 | TupleStructPat |
-| gen_box_pat.rs:7:9:7:24 | BoxPat | getInner: | gen_box_pat.rs:7:13:7:24 | PathPat |
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.ql b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.ql
deleted file mode 100644
index 525eac919824b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BoxPat x, Pat getInner
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getInner = x.getInner()
-select x, "getInner:", getInner
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/BoxPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BoxPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/gen_box_pat.rs b/rust/ql/test/extractor-tests/generated/BoxPat/gen_box_pat.rs
deleted file mode 100644
index f26d31d72f9c7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BoxPat/gen_box_pat.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_box_pat() -> () {
-    // A box pattern. For example:
-    match x {
-        box Option::Some(y) => y,
-        box Option::None => 0,
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected
deleted file mode 100644
index c7b451c235fc4..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_break_expr.rs:7:13:7:17 | BreakExpr | hasExpr: | no | hasLabel: | no |
-| gen_break_expr.rs:12:13:12:27 | BreakExpr | hasExpr: | yes | hasLabel: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql
deleted file mode 100644
index 39b93ac5fe4d0..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BreakExpr x, string hasExpr, string hasLabel
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
-  if x.hasLabel() then hasLabel = "yes" else hasLabel = "no"
-select x, "hasExpr:", hasExpr, "hasLabel:", hasLabel
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected
deleted file mode 100644
index 16dfc81245904..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:12:26:12:27 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.ql
deleted file mode 100644
index 0ae64a4d53313..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BreakExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.expected
deleted file mode 100644
index e8918129a36e8..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:10:13:10:19 | Label |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.ql b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.ql
deleted file mode 100644
index 7deb806e30670..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from BreakExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getLabel()
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/BreakExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/gen_break_expr.rs b/rust/ql/test/extractor-tests/generated/BreakExpr/gen_break_expr.rs
deleted file mode 100644
index cd40541da9c42..0000000000000
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/gen_break_expr.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_break_expr() -> () {
-    // A break expression. For example:
-    loop {
-        if not_ready() {
-            break;
-         }
-    }
-    let x = 'label: loop {
-        if done() {
-            break 'label 42;
-        }
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected
deleted file mode 100644
index 111ff8392d21f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_call_expr.rs:5:5:5:11 | CallExpr | getCallee: | gen_call_expr.rs:5:5:5:7 | PathExpr | getNumberOfArgs: | 1 | isAssigneeExpr: | no |
-| gen_call_expr.rs:6:5:6:23 | CallExpr | getCallee: | gen_call_expr.rs:6:5:6:19 | PathExpr | getNumberOfArgs: | 1 | isAssigneeExpr: | no |
-| gen_call_expr.rs:7:5:7:14 | CallExpr | getCallee: | gen_call_expr.rs:7:5:7:10 | IndexExpr | getNumberOfArgs: | 1 | isAssigneeExpr: | no |
-| gen_call_expr.rs:8:5:8:10 | CallExpr | getCallee: | gen_call_expr.rs:8:5:8:7 | PathExpr | getNumberOfArgs: | 1 | isAssigneeExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
deleted file mode 100644
index ddbe62ac5a0ca..0000000000000
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from CallExpr x, Expr getCallee, int getNumberOfArgs, string isAssigneeExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getCallee = x.getCallee() and
-  getNumberOfArgs = x.getNumberOfArgs() and
-  if x.isAssigneeExpr() then isAssigneeExpr = "yes" else isAssigneeExpr = "no"
-select x, "getCallee:", getCallee, "getNumberOfArgs:", getNumberOfArgs, "isAssigneeExpr:",
-  isAssigneeExpr
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.expected
deleted file mode 100644
index 6ff1a242993c9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_call_expr.rs:5:5:5:11 | CallExpr | 0 | gen_call_expr.rs:5:9:5:10 | LiteralExpr |
-| gen_call_expr.rs:6:5:6:23 | CallExpr | 0 | gen_call_expr.rs:6:21:6:22 | LiteralExpr |
-| gen_call_expr.rs:7:5:7:14 | CallExpr | 0 | gen_call_expr.rs:7:12:7:13 | LiteralExpr |
-| gen_call_expr.rs:8:5:8:10 | CallExpr | 0 | gen_call_expr.rs:8:9:8:9 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql
deleted file mode 100644
index 37483c3e63781..0000000000000
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from CallExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArg(index)
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/CallExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/gen_call_expr.rs b/rust/ql/test/extractor-tests/generated/CallExpr/gen_call_expr.rs
deleted file mode 100644
index b2436cc00429c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/CallExpr/gen_call_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_call_expr() -> () {
-    // A function call expression. For example:
-    foo(42);
-    foo::<u32, u64>(42);
-    foo[0](42);
-    foo(1) = 4;
-}
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
deleted file mode 100644
index b06efc92f75b0..0000000000000
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_cast_expr.rs:5:5:5:16 | CastExpr | getExpr: | gen_cast_expr.rs:5:5:5:9 | PathExpr | getType: | file://:0:0:0:0 | TypeRef |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
deleted file mode 100644
index 1082b80fa01a5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from CastExpr x, Expr getExpr, TypeRef getType
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr() and
-  getType = x.getType()
-select x, "getExpr:", getExpr, "getType:", getType
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/CastExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/gen_cast_expr.rs b/rust/ql/test/extractor-tests/generated/CastExpr/gen_cast_expr.rs
deleted file mode 100644
index 2945c711320a0..0000000000000
--- a/rust/ql/test/extractor-tests/generated/CastExpr/gen_cast_expr.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_cast_expr() -> () {
-    // A cast expression. For example:
-    value as u64;
-}
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ClosureBinder/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureBinder/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
deleted file mode 100644
index 0d9c025ea4a6a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | no | getBody: | gen_closure_expr.rs:5:9:5:13 | BinaryExpr | getClosureKind: | Closure | isMove: | no |
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | yes | getBody: | gen_closure_expr.rs:6:26:6:34 | BlockExpr | getClosureKind: | Closure | isMove: | yes |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | getNumberOfArgs: | 2 | hasRetType: | no | getBody: | gen_closure_expr.rs:7:23:7:27 | BinaryExpr | getClosureKind: | Async | isMove: | no |
-| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | no | getBody: | gen_closure_expr.rs:9:9:9:15 | YieldExpr | getClosureKind: | Coroutine(Movable) | isMove: | no |
-| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | no | getBody: | gen_closure_expr.rs:11:17:11:23 | YieldExpr | getClosureKind: | Coroutine(Static) | isMove: | no |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
deleted file mode 100644
index d2c394b4ad8e5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
+++ /dev/null
@@ -1,17 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from
-  ClosureExpr x, int getNumberOfArgs, string hasRetType, Expr getBody, string getClosureKind,
-  string isMove
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfArgs = x.getNumberOfArgs() and
-  (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and
-  getBody = x.getBody() and
-  getClosureKind = x.getClosureKind() and
-  if x.isMove() then isMove = "yes" else isMove = "no"
-select x, "getNumberOfArgs:", getNumberOfArgs, "hasRetType:", hasRetType, "getBody:", getBody,
-  "getClosureKind:", getClosureKind, "isMove:", isMove
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.expected
deleted file mode 100644
index 41bbc86fb709d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | 0 | gen_closure_expr.rs:5:6:5:6 | IdentPat |
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | 0 | gen_closure_expr.rs:6:11:6:11 | IdentPat |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | 0 | gen_closure_expr.rs:7:12:7:12 | IdentPat |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | 1 | gen_closure_expr.rs:7:20:7:20 | IdentPat |
-| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | 0 | gen_closure_expr.rs:9:6:9:6 | IdentPat |
-| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | 0 | gen_closure_expr.rs:11:14:11:14 | IdentPat |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.ql
deleted file mode 100644
index f10c54f1ff3a4..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ClosureExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArg(index)
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.expected
deleted file mode 100644
index dd1f87a74c10f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | 0 | file://:0:0:0:0 | TypeRef |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | 0 | file://:0:0:0:0 | TypeRef |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.ql
deleted file mode 100644
index dcac99b7ed414..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ClosureExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArgType(index)
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
deleted file mode 100644
index 6decd91ca765c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | file://:0:0:0:0 | TypeRef |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql
deleted file mode 100644
index acafcc7106208..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ClosureExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getRetType()
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ClosureExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/gen_closure_expr.rs b/rust/ql/test/extractor-tests/generated/ClosureExpr/gen_closure_expr.rs
deleted file mode 100644
index 4c0c6067aac65..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/gen_closure_expr.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_closure_expr() -> () {
-    // A closure expression. For example:
-    |x| x + 1;
-    move |x: i32| -> i32 { x + 1 };
-    async |x: i32, y| x + y;
-     #[coroutine]
-    |x| yield x;
-     #[coroutine]
-     static |x| yield x;
-}
diff --git a/rust/ql/test/extractor-tests/generated/Const/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Const/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Const/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ConstArg/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ConstArg/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstArg/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected
deleted file mode 100644
index 965df88445ed5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_const_block_pat.rs:6:9:6:27 | ConstBlockPat | getExpr: | gen_const_block_pat.rs:6:15:6:27 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql
deleted file mode 100644
index b298a56e8c481..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ConstBlockPat x, Expr getExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ConstBlockPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstBlockPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/gen_const_block_pat.rs b/rust/ql/test/extractor-tests/generated/ConstBlockPat/gen_const_block_pat.rs
deleted file mode 100644
index 2eba97954c7f9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ConstBlockPat/gen_const_block_pat.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_const_block_pat() -> () {
-    // A const block pattern. For example:
-    match x {
-        const { 1 + 2 + 3 } => "ok",
-        _ => "fail",
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.expected b/rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.expected
deleted file mode 100644
index b36d974f77349..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_const_expr.rs:5:8:5:97 | ConstExpr | getExpr: | gen_const_expr.rs:5:8:5:97 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.ql b/rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.ql
deleted file mode 100644
index 293158e36aef8..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ConstExpr/ConstExpr.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ConstExpr x, Expr getExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
diff --git a/rust/ql/test/extractor-tests/generated/ConstExpr/gen_const_expr.rs b/rust/ql/test/extractor-tests/generated/ConstExpr/gen_const_expr.rs
deleted file mode 100644
index f23ce557961b6..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ConstExpr/gen_const_expr.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_const_expr() -> bool {
-    // A `const` block expression. For example:
-    if const { SRC::IS_ZST || DEST::IS_ZST || mem::align_of::<SRC>() != mem::align_of::<DEST>() } {
-        return false;
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ConstParam/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected
deleted file mode 100644
index 5bc5e5fc66677..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_continue_expr.rs:7:13:7:20 | ContinueExpr | hasLabel: | no |
-| gen_continue_expr.rs:12:13:12:27 | ContinueExpr | hasLabel: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql
deleted file mode 100644
index 89fe9d7021c7a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ContinueExpr x, string hasLabel
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  if x.hasLabel() then hasLabel = "yes" else hasLabel = "no"
-select x, "hasLabel:", hasLabel
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.expected
deleted file mode 100644
index 8688627b27ee9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_continue_expr.rs:12:13:12:27 | ContinueExpr | gen_continue_expr.rs:10:5:10:11 | Label |
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.ql b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.ql
deleted file mode 100644
index ecfccc42d65d6..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLabel.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ContinueExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getLabel()
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ContinueExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/gen_continue_expr.rs b/rust/ql/test/extractor-tests/generated/ContinueExpr/gen_continue_expr.rs
deleted file mode 100644
index a50d5ee4139d9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/gen_continue_expr.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_continue_expr() -> () {
-    // A continue expression. For example:
-    loop {
-        if not_ready() {
-            continue;
-        }
-    }
-    'label: loop {
-        if not_ready() {
-            continue 'label;
-        }
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/DynTraitType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DynTraitType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.expected b/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.expected
deleted file mode 100644
index 8d6bdea67755f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | getNumberOfElements: | 5 | isAssigneeExpr: | no |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | getNumberOfElements: | 5 | isAssigneeExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.ql b/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.ql
deleted file mode 100644
index 38b861e7db0a1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ElementListExpr x, int getNumberOfElements, string isAssigneeExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfElements = x.getNumberOfElements() and
-  if x.isAssigneeExpr() then isAssigneeExpr = "yes" else isAssigneeExpr = "no"
-select x, "getNumberOfElements:", getNumberOfElements, "isAssigneeExpr:", isAssigneeExpr
diff --git a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.expected b/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.expected
deleted file mode 100644
index 8bed9878b6e9b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 0 | gen_element_list_expr.rs:5:6:5:6 | LiteralExpr |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 1 | gen_element_list_expr.rs:5:9:5:9 | LiteralExpr |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 2 | gen_element_list_expr.rs:5:12:5:12 | LiteralExpr |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 3 | gen_element_list_expr.rs:5:15:5:15 | LiteralExpr |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 4 | gen_element_list_expr.rs:5:18:5:18 | LiteralExpr |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 0 | gen_element_list_expr.rs:6:6:6:6 | LiteralExpr |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 1 | gen_element_list_expr.rs:6:9:6:9 | LiteralExpr |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 2 | gen_element_list_expr.rs:6:12:6:12 | LiteralExpr |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 3 | gen_element_list_expr.rs:6:15:6:15 | LiteralExpr |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 4 | gen_element_list_expr.rs:6:18:6:18 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.ql b/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.ql
deleted file mode 100644
index b66322849c4e0..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ElementListExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getElement(index)
diff --git a/rust/ql/test/extractor-tests/generated/ElementListExpr/gen_element_list_expr.rs b/rust/ql/test/extractor-tests/generated/ElementListExpr/gen_element_list_expr.rs
deleted file mode 100644
index d074b0a2553bd..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ElementListExpr/gen_element_list_expr.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_element_list_expr() -> () {
-    // An element list expression. For example:
-    [1, 2, 3, 4, 5];
-    [1, 2, 3, 4, 5][0] = 6;
-}
diff --git a/rust/ql/test/extractor-tests/generated/Enum/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Enum/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Enum/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.expected b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.expected
deleted file mode 100644
index 38497d3afabfe..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_expr_stmt.rs:5:5:5:11 | ExprStmt | getExpr: | gen_expr_stmt.rs:5:5:5:11 | CallExpr | hasSemicolon: | yes |
-| gen_expr_stmt.rs:6:5:6:12 | ExprStmt | getExpr: | gen_expr_stmt.rs:6:5:6:12 | CallExpr | hasSemicolon: | no |
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.ql b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.ql
deleted file mode 100644
index 4e6d5ab9d1923..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ExprStmt x, Expr getExpr, string hasSemicolon
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr() and
-  if x.hasSemicolon() then hasSemicolon = "yes" else hasSemicolon = "no"
-select x, "getExpr:", getExpr, "hasSemicolon:", hasSemicolon
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ExprStmt/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExprStmt/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/gen_expr_stmt.rs b/rust/ql/test/extractor-tests/generated/ExprStmt/gen_expr_stmt.rs
deleted file mode 100644
index bf6d4f667f27c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ExprStmt/gen_expr_stmt.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_expr_stmt() -> () {
-    // An expression statement. For example:
-    start();
-    finish()
-    use std::env;
-}
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ExternBlock/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ExternCrate/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ExternItemList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ExternItemList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected
deleted file mode 100644
index 0ac28f7f13f89..0000000000000
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_field_expr.rs:5:5:5:9 | FieldExpr | getExpr: | gen_field_expr.rs:5:5:5:5 | PathExpr | getName: | foo |
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql
deleted file mode 100644
index 72b068b1c87b6..0000000000000
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from FieldExpr x, Expr getExpr, string getName
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr() and
-  getName = x.getName()
-select x, "getExpr:", getExpr, "getName:", getName
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/FieldExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/gen_field_expr.rs b/rust/ql/test/extractor-tests/generated/FieldExpr/gen_field_expr.rs
deleted file mode 100644
index cbef641208876..0000000000000
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/gen_field_expr.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_field_expr() -> () {
-    // A field access expression. For example:
-    x.foo
-}
diff --git a/rust/ql/test/extractor-tests/generated/Fn/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Fn/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Fn/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/FnPtrType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FnPtrType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ForExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ForType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ForType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/FormatArgsArg/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsArg/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.expected b/rust/ql/test/extractor-tests/generated/Function/Function.expected
deleted file mode 100644
index ccb4ce460e3ab..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Function/Function.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_function.rs:3:1:4:38 | foo | getName: | foo | getBody: | gen_function.rs:4:23:4:38 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.ql b/rust/ql/test/extractor-tests/generated/Function/Function.ql
deleted file mode 100644
index e9faa2aef179b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Function/Function.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from Function x, string getName, Expr getBody
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getName = x.getName() and
-  getBody = x.getBody()
-select x, "getName:", getName, "getBody:", getBody
diff --git a/rust/ql/test/extractor-tests/generated/Function/gen_function.rs b/rust/ql/test/extractor-tests/generated/Function/gen_function.rs
deleted file mode 100644
index 8b6153205460d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Function/gen_function.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-// A function declaration. For example
-fn foo(x: u32) -> u64 {(x + 1).into()}
-// A function declaration within a trait might not have a body:
-trait Trait {
-    fn bar();
-}
diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected
deleted file mode 100644
index 43c48a031599f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected
+++ /dev/null
@@ -1 +0,0 @@
-| file://:0:0:0:0 | GenericArgList |
diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql
deleted file mode 100644
index b35dd87ab965f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from GenericArgList x
-where toBeTested(x) and not x.isUnknown()
-select x
diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/GenericArgList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/GenericArgList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/gen_generic_arg_list.rs b/rust/ql/test/extractor-tests/generated/GenericArgList/gen_generic_arg_list.rs
deleted file mode 100644
index 2088341a9ced2..0000000000000
--- a/rust/ql/test/extractor-tests/generated/GenericArgList/gen_generic_arg_list.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_generic_arg_list() -> () {
-    // The base class for generic arguments.
-    x.foo::<u32, u64>(42);
-}
diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/GenericParamList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/GenericParamList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected
deleted file mode 100644
index 6973ca9aba2e9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_ident_pat.rs:6:22:6:22 | IdentPat | getBindingId: | y | hasSubpat: | no |
-| gen_ident_pat.rs:10:9:10:25 | IdentPat | getBindingId: | y | hasSubpat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
deleted file mode 100644
index 2eb3e3ac35bf1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from IdentPat x, string getBindingId, string hasSubpat
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getBindingId = x.getBindingId() and
-  if x.hasSubpat() then hasSubpat = "yes" else hasSubpat = "no"
-select x, "getBindingId:", getBindingId, "hasSubpat:", hasSubpat
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.expected
deleted file mode 100644
index 705456753b9cc..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_ident_pat.rs:10:9:10:25 | IdentPat | gen_ident_pat.rs:10:11:10:25 | TupleStructPat |
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql
deleted file mode 100644
index 0fd3f8cfe777a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from IdentPat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getSubpat()
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/IdentPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/gen_ident_pat.rs b/rust/ql/test/extractor-tests/generated/IdentPat/gen_ident_pat.rs
deleted file mode 100644
index 8158e14f2f3e3..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IdentPat/gen_ident_pat.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_ident_pat() -> () {
-    // A binding pattern. For example:
-    match x {
-        Option::Some(y) => y,
-        Option::None => 0,
-    };
-    match x {
-        y@Option::Some(_) => y,
-        Option::None => 0,
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected
deleted file mode 100644
index 44dff354b0475..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_if_expr.rs:5:5:7:5 | IfExpr | getCondition: | gen_if_expr.rs:5:8:5:14 | BinaryExpr | getThen: | gen_if_expr.rs:5:16:7:5 | BlockExpr | hasElse: | no |
-| gen_if_expr.rs:8:13:12:5 | IfExpr | getCondition: | gen_if_expr.rs:8:16:8:20 | BinaryExpr | getThen: | gen_if_expr.rs:8:22:10:5 | BlockExpr | hasElse: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql
deleted file mode 100644
index 4b230a91c152d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.ql
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from IfExpr x, Expr getCondition, Expr getThen, string hasElse
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getCondition = x.getCondition() and
-  getThen = x.getThen() and
-  if x.hasElse() then hasElse = "yes" else hasElse = "no"
-select x, "getCondition:", getCondition, "getThen:", getThen, "hasElse:", hasElse
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getElse.expected b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getElse.expected
deleted file mode 100644
index a857dbe2099a3..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getElse.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_if_expr.rs:8:13:12:5 | IfExpr | gen_if_expr.rs:10:12:12:5 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getElse.ql b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getElse.ql
deleted file mode 100644
index 187637aab2129..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getElse.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from IfExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getElse()
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/IfExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/gen_if_expr.rs b/rust/ql/test/extractor-tests/generated/IfExpr/gen_if_expr.rs
deleted file mode 100644
index 22de54eb8962d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IfExpr/gen_if_expr.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_if_expr() -> () {
-    // An `if` expression. For example:
-    if x == 42 {
-        println!("that's the answer");
-    }
-    let y = if x > 0 {
-        1
-    } else {
-        0
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/Impl/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Impl/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Impl/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ImplTraitType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected
deleted file mode 100644
index edbf139dfc35f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_index_expr.rs:5:5:5:12 | IndexExpr | getBase: | gen_index_expr.rs:5:5:5:8 | PathExpr | getIndex: | gen_index_expr.rs:5:10:5:11 | LiteralExpr | isAssigneeExpr: | no |
-| gen_index_expr.rs:6:5:6:12 | IndexExpr | getBase: | gen_index_expr.rs:6:5:6:8 | PathExpr | getIndex: | gen_index_expr.rs:6:10:6:11 | LiteralExpr | isAssigneeExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql
deleted file mode 100644
index 1443f3e58e287..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.ql
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from IndexExpr x, Expr getBase, Expr getIndex, string isAssigneeExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getBase = x.getBase() and
-  getIndex = x.getIndex() and
-  if x.isAssigneeExpr() then isAssigneeExpr = "yes" else isAssigneeExpr = "no"
-select x, "getBase:", getBase, "getIndex:", getIndex, "isAssigneeExpr:", isAssigneeExpr
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/IndexExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/gen_index_expr.rs b/rust/ql/test/extractor-tests/generated/IndexExpr/gen_index_expr.rs
deleted file mode 100644
index f4f6a75d904c8..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IndexExpr/gen_index_expr.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_index_expr() -> () {
-    // An index expression. For example:
-    list[42];
-    list[42] = 1;
-}
diff --git a/rust/ql/test/extractor-tests/generated/InferType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/InferType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/InferType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ItemList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ItemList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Label/Label.expected b/rust/ql/test/extractor-tests/generated/Label/Label.expected
deleted file mode 100644
index 297511910be5e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Label/Label.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_label.rs:5:5:5:11 | Label | getName: | 'label |
-| gen_label.rs:5:5:5:11 | Label | getName: | 'label |
diff --git a/rust/ql/test/extractor-tests/generated/Label/Label.ql b/rust/ql/test/extractor-tests/generated/Label/Label.ql
deleted file mode 100644
index 6fa1930f0bad3..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Label/Label.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from Label x, string getName
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getName = x.getName()
-select x, "getName:", getName
diff --git a/rust/ql/test/extractor-tests/generated/Label/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Label/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Label/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Label/gen_label.rs b/rust/ql/test/extractor-tests/generated/Label/gen_label.rs
deleted file mode 100644
index 4500ab4626bc3..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Label/gen_label.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_label() -> () {
-    // A label. For example:
-    'label: loop {
-        println!("Hello, world (once)!");
-        break 'label;
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/LetElse/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/LetElse/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetElse/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected
deleted file mode 100644
index 41d358886f42e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_let_expr.rs:5:8:5:31 | LetExpr | getPat: | gen_let_expr.rs:5:12:5:18 | TupleStructPat | getExpr: | gen_let_expr.rs:5:22:5:31 | PathExpr |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql
deleted file mode 100644
index a00b026d048ab..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from LetExpr x, Pat getPat, Expr getExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getPat = x.getPat() and
-  getExpr = x.getExpr()
-select x, "getPat:", getPat, "getExpr:", getExpr
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/LetExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/gen_let_expr.rs b/rust/ql/test/extractor-tests/generated/LetExpr/gen_let_expr.rs
deleted file mode 100644
index cc9f588d66dd0..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetExpr/gen_let_expr.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_let_expr(maybe_some: Option<String>) -> () {
-    // A `let` expression. For example:
-    if let Some(x) = maybe_some {
-        println!("{}", x);
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
deleted file mode 100644
index a60f247983329..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-| gen_let_stmt.rs:5:9:5:9 | LetStmt | getPat: | gen_let_stmt.rs:5:9:5:9 | IdentPat | hasType: | no | hasInitializer: | yes | hasElse: | no |
-| gen_let_stmt.rs:6:9:6:9 | LetStmt | getPat: | gen_let_stmt.rs:6:9:6:9 | IdentPat | hasType: | yes | hasInitializer: | yes | hasElse: | no |
-| gen_let_stmt.rs:7:9:7:9 | LetStmt | getPat: | gen_let_stmt.rs:7:9:7:9 | IdentPat | hasType: | yes | hasInitializer: | no | hasElse: | no |
-| gen_let_stmt.rs:8:9:8:9 | LetStmt | getPat: | gen_let_stmt.rs:8:9:8:9 | IdentPat | hasType: | no | hasInitializer: | no | hasElse: | no |
-| gen_let_stmt.rs:9:9:9:14 | LetStmt | getPat: | gen_let_stmt.rs:9:9:9:14 | TuplePat | hasType: | no | hasInitializer: | yes | hasElse: | no |
-| gen_let_stmt.rs:10:9:10:15 | LetStmt | getPat: | gen_let_stmt.rs:10:9:10:15 | TupleStructPat | hasType: | no | hasInitializer: | yes | hasElse: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
deleted file mode 100644
index 6d67a88dcb546..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from LetStmt x, Pat getPat, string hasType, string hasInitializer, string hasElse
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getPat = x.getPat() and
-  (if x.hasType() then hasType = "yes" else hasType = "no") and
-  (if x.hasInitializer() then hasInitializer = "yes" else hasInitializer = "no") and
-  if x.hasElse() then hasElse = "yes" else hasElse = "no"
-select x, "getPat:", getPat, "hasType:", hasType, "hasInitializer:", hasInitializer, "hasElse:",
-  hasElse
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.expected
deleted file mode 100644
index 2d6e500d14a64..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_let_stmt.rs:10:9:10:15 | LetStmt | gen_let_stmt.rs:10:45:12:5 | BlockExpr |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql
deleted file mode 100644
index 35c29979fd030..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from LetStmt x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getElse()
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected
deleted file mode 100644
index 59bffddf54534..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_let_stmt.rs:5:9:5:9 | LetStmt | gen_let_stmt.rs:5:13:5:14 | LiteralExpr |
-| gen_let_stmt.rs:6:9:6:9 | LetStmt | gen_let_stmt.rs:6:18:6:19 | LiteralExpr |
-| gen_let_stmt.rs:9:9:9:14 | LetStmt | gen_let_stmt.rs:9:18:9:23 | TupleExpr |
-| gen_let_stmt.rs:10:9:10:15 | LetStmt | gen_let_stmt.rs:10:19:10:38 | CallExpr |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql
deleted file mode 100644
index cac847aa7265a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from LetStmt x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getInitializer()
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.expected
deleted file mode 100644
index 7a67697cb6530..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_let_stmt.rs:6:9:6:9 | LetStmt | file://:0:0:0:0 | TypeRef |
-| gen_let_stmt.rs:7:9:7:9 | LetStmt | file://:0:0:0:0 | TypeRef |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.ql
deleted file mode 100644
index 641cdfe324584..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from LetStmt x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getType()
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/LetStmt/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/gen_let_stmt.rs b/rust/ql/test/extractor-tests/generated/LetStmt/gen_let_stmt.rs
deleted file mode 100644
index 7117dfaf9b9b8..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/gen_let_stmt.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_let_stmt() -> () {
-    // A let statement. For example:
-    let x = 42;
-    let x: i32 = 42;
-    let x: i32;
-    let x;
-    let (x, y) = (1, 2);
-    let Some(x) = std::env::var("FOO") else {
-        return;
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/Lifetime/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Lifetime/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Lifetime/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeArg/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/LifetimeArg/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeArg/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/LifetimeParam/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LifetimeParam/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Literal/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Literal/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Literal/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected
deleted file mode 100644
index 4ea6107f6a810..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-| gen_literal_expr.rs:5:5:5:6 | LiteralExpr |
-| gen_literal_expr.rs:6:5:6:8 | LiteralExpr |
-| gen_literal_expr.rs:7:5:7:19 | LiteralExpr |
-| gen_literal_expr.rs:8:5:8:20 | LiteralExpr |
-| gen_literal_expr.rs:9:5:9:7 | LiteralExpr |
-| gen_literal_expr.rs:10:5:10:8 | LiteralExpr |
-| gen_literal_expr.rs:11:5:11:20 | LiteralExpr |
-| gen_literal_expr.rs:12:5:12:8 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql
deleted file mode 100644
index 70c1d4f7c3fd5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from LiteralExpr x
-where toBeTested(x) and not x.isUnknown()
-select x
diff --git a/rust/ql/test/extractor-tests/generated/LiteralExpr/gen_literal_expr.rs b/rust/ql/test/extractor-tests/generated/LiteralExpr/gen_literal_expr.rs
deleted file mode 100644
index f8d33aeaa8cc8..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LiteralExpr/gen_literal_expr.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_literal_expr() -> () {
-    // A literal expression. For example:
-    42;
-    42.0;
-    "Hello, world!";
-    b"Hello, world!";
-    'x';
-    b'x';
-    r"Hello, world!";
-    true;
-}
diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected
deleted file mode 100644
index ebde9562c6da1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_literal_pat.rs:6:9:6:10 | LiteralPat | getExpr: | gen_literal_pat.rs:6:9:6:10 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.ql b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.ql
deleted file mode 100644
index 4c8993f88bb41..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from LiteralPat x, Expr getExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr()
-select x, "getExpr:", getExpr
diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/LiteralPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LiteralPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/gen_literal_pat.rs b/rust/ql/test/extractor-tests/generated/LiteralPat/gen_literal_pat.rs
deleted file mode 100644
index 26ed7ebcd1053..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LiteralPat/gen_literal_pat.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_literal_pat() -> () {
-    // A literal pattern. For example:
-    match x {
-        42 => "ok",
-        _ => "fail",
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected
deleted file mode 100644
index 82e50bf474f48..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| gen_loop_expr.rs:5:5:7:5 | LoopExpr | getBody: | gen_loop_expr.rs:5:10:7:5 | BlockExpr | hasLabel: | no |
-| gen_loop_expr.rs:8:5:11:5 | LoopExpr | getBody: | gen_loop_expr.rs:8:18:11:5 | BlockExpr | hasLabel: | yes |
-| gen_loop_expr.rs:13:5:19:5 | LoopExpr | getBody: | gen_loop_expr.rs:13:10:19:5 | BlockExpr | hasLabel: | no |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql
deleted file mode 100644
index 535381c822c0f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from LoopExpr x, Expr getBody, string hasLabel
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getBody = x.getBody() and
-  if x.hasLabel() then hasLabel = "yes" else hasLabel = "no"
-select x, "getBody:", getBody, "hasLabel:", hasLabel
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.expected
deleted file mode 100644
index 98a657f09832a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_loop_expr.rs:8:5:11:5 | LoopExpr | gen_loop_expr.rs:8:5:8:11 | Label |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql
deleted file mode 100644
index 9617abd7f346e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from LoopExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getLabel()
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/LoopExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/gen_loop_expr.rs b/rust/ql/test/extractor-tests/generated/LoopExpr/gen_loop_expr.rs
deleted file mode 100644
index 33ac9d5ecc605..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/gen_loop_expr.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_loop_expr() -> () {
-    // A loop expression. For example:
-    loop {
-        println!("Hello, world (again)!");
-    };
-    'label: loop {
-        println!("Hello, world (once)!");
-        break 'label;
-    };
-    let mut x = 0;
-    loop {
-        if x < 10 {
-            x += 1;
-        } else {
-            break;
-        }
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroCall/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroDef/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MacroExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MacroPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroRules/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MacroType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MatchArm/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected
deleted file mode 100644
index 97b049e6f5402..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_match_arm.rs:6:9:6:23 | MatchArm | getPat: | gen_match_arm.rs:6:9:6:23 | TupleStructPat | hasGuard: | no | getExpr: | gen_match_arm.rs:6:28:6:28 | PathExpr |
-| gen_match_arm.rs:7:9:7:20 | MatchArm | getPat: | gen_match_arm.rs:7:9:7:20 | PathPat | hasGuard: | no | getExpr: | gen_match_arm.rs:7:25:7:25 | LiteralExpr |
-| gen_match_arm.rs:10:9:10:15 | MatchArm | getPat: | gen_match_arm.rs:10:9:10:15 | TupleStructPat | hasGuard: | yes | getExpr: | gen_match_arm.rs:10:30:10:34 | BinaryExpr |
-| gen_match_arm.rs:11:9:11:9 | MatchArm | getPat: | gen_match_arm.rs:11:9:11:9 | WildcardPat | hasGuard: | no | getExpr: | gen_match_arm.rs:11:14:11:14 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql
deleted file mode 100644
index 10b8f33d0c60d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.ql
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from MatchArm x, Pat getPat, string hasGuard, Expr getExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getPat = x.getPat() and
-  (if x.hasGuard() then hasGuard = "yes" else hasGuard = "no") and
-  getExpr = x.getExpr()
-select x, "getPat:", getPat, "hasGuard:", hasGuard, "getExpr:", getExpr
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected
deleted file mode 100644
index 7430f1179eb7e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_match_arm.rs:10:9:10:15 | MatchArm | gen_match_arm.rs:10:20:10:25 | BinaryExpr |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.ql b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.ql
deleted file mode 100644
index 508c72779ed75..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from MatchArm x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getGuard()
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/gen_match_arm.rs b/rust/ql/test/extractor-tests/generated/MatchArm/gen_match_arm.rs
deleted file mode 100644
index 5f5922e8ef4c8..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchArm/gen_match_arm.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_match_arm(x: i32) -> i32 {
-    // A match arm. For example:
-    match x {
-        Option::Some(y) => y,
-        Option::None => 0,
-    };
-    match x {
-        Some(y) if y != 0 => 1 / y,
-        _ => 0,
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MatchArmList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchArmList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MatchExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected
deleted file mode 100644
index 15c7dcb2f2375..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_match_expr.rs:5:5:8:5 | MatchExpr | getExpr: | gen_match_expr.rs:5:11:5:11 | PathExpr | getNumberOfBranches: | 2 |
-| gen_match_expr.rs:9:5:12:5 | MatchExpr | getExpr: | gen_match_expr.rs:9:11:9:11 | PathExpr | getNumberOfBranches: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql
deleted file mode 100644
index efdc81755c766..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from MatchExpr x, Expr getExpr, int getNumberOfBranches
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr() and
-  getNumberOfBranches = x.getNumberOfBranches()
-select x, "getExpr:", getExpr, "getNumberOfBranches:", getNumberOfBranches
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.expected
deleted file mode 100644
index ff70602e20dd5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_match_expr.rs:5:5:8:5 | MatchExpr | 0 | gen_match_expr.rs:6:9:6:23 | MatchArm |
-| gen_match_expr.rs:5:5:8:5 | MatchExpr | 1 | gen_match_expr.rs:7:9:7:20 | MatchArm |
-| gen_match_expr.rs:9:5:12:5 | MatchExpr | 0 | gen_match_expr.rs:10:9:10:15 | MatchArm |
-| gen_match_expr.rs:9:5:12:5 | MatchExpr | 1 | gen_match_expr.rs:11:9:11:9 | MatchArm |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.ql b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.ql
deleted file mode 100644
index cf7ad63b345b0..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getBranch.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from MatchExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getBranch(index)
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/gen_match_expr.rs b/rust/ql/test/extractor-tests/generated/MatchExpr/gen_match_expr.rs
deleted file mode 100644
index 96138534fd563..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/gen_match_expr.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_match_expr(x: i32) -> i32 {
-    // A match expression. For example:
-    match x {
-        Option::Some(y) => y,
-        Option::None => 0,
-    }
-    match x {
-        Some(y) if y != 0 => 1 / y,
-        _ => 0,
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/MatchGuard/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MatchGuard/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchGuard/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Meta/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Meta/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Meta/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
deleted file mode 100644
index d28ebe1c53edf..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_method_call_expr.rs:5:5:5:13 | MethodCallExpr | getReceiver: | gen_method_call_expr.rs:5:5:5:5 | PathExpr | getMethodName: | foo | getNumberOfArgs: | 1 | hasGenericArgs: | no |
-| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | getReceiver: | gen_method_call_expr.rs:6:5:6:5 | PathExpr | getMethodName: | foo | getNumberOfArgs: | 1 | hasGenericArgs: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
deleted file mode 100644
index ff0ee06bcf534..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from
-  MethodCallExpr x, Expr getReceiver, string getMethodName, int getNumberOfArgs,
-  string hasGenericArgs
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getReceiver = x.getReceiver() and
-  getMethodName = x.getMethodName() and
-  getNumberOfArgs = x.getNumberOfArgs() and
-  if x.hasGenericArgs() then hasGenericArgs = "yes" else hasGenericArgs = "no"
-select x, "getReceiver:", getReceiver, "getMethodName:", getMethodName, "getNumberOfArgs:",
-  getNumberOfArgs, "hasGenericArgs:", hasGenericArgs
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.expected
deleted file mode 100644
index 601b344cd0fc7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_method_call_expr.rs:5:5:5:13 | MethodCallExpr | 0 | gen_method_call_expr.rs:5:11:5:12 | LiteralExpr |
-| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | 0 | gen_method_call_expr.rs:6:23:6:24 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql
deleted file mode 100644
index 58529cebfe5e2..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from MethodCallExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArg(index)
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.expected
deleted file mode 100644
index f4590b4f4e150..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | file://:0:0:0:0 | GenericArgList |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.ql
deleted file mode 100644
index 3ea5a68b3029a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgs.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from MethodCallExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getGenericArgs()
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/gen_method_call_expr.rs b/rust/ql/test/extractor-tests/generated/MethodCallExpr/gen_method_call_expr.rs
deleted file mode 100644
index f8bf728d2570e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/gen_method_call_expr.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_method_call_expr() -> () {
-    // A method call expression. For example:
-    x.foo(42);
-    x.foo::<u32, u64>(42);
-}
diff --git a/rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.expected b/rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.expected
deleted file mode 100644
index bd096b3f48804..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_missing_expr.rs:6:13:6:33 | MissingExpr |
diff --git a/rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.ql b/rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.ql
deleted file mode 100644
index 1aa6119b6aade..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MissingExpr/MissingExpr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from MissingExpr x
-where toBeTested(x) and not x.isUnknown()
-select x
diff --git a/rust/ql/test/extractor-tests/generated/MissingExpr/gen_missing_expr.rs b/rust/ql/test/extractor-tests/generated/MissingExpr/gen_missing_expr.rs
deleted file mode 100644
index dea3de12cf137..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MissingExpr/gen_missing_expr.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_missing_expr() -> () {
-    // A missing expression, used as a placeholder for incomplete syntax.
-    // 
-    let x = non_existing_macro!();
-}
diff --git a/rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.expected b/rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.expected
deleted file mode 100644
index 10515823daae3..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_missing_pat.rs:6:9:6:10 | MissingPat |
diff --git a/rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.ql b/rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.ql
deleted file mode 100644
index 61047e1e6beab..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MissingPat/MissingPat.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from MissingPat x
-where toBeTested(x) and not x.isUnknown()
-select x
diff --git a/rust/ql/test/extractor-tests/generated/MissingPat/gen_missing_pat.rs b/rust/ql/test/extractor-tests/generated/MissingPat/gen_missing_pat.rs
deleted file mode 100644
index 0848d4531c3ef..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MissingPat/gen_missing_pat.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_missing_pat() -> () {
-    // A missing pattern, used as a place holder for incomplete syntax.
-    match Some(42) {
-        .. => "bad use of .. syntax",
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/Module/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Module/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Module/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.expected b/rust/ql/test/extractor-tests/generated/Module/Module.expected
deleted file mode 100644
index 7198e7b0f23f9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Module/Module.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 0 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 0 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 0 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 1 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 2 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 2 |
-| file://:0:0:0:0 | Module | getNumberOfDeclarations: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.ql b/rust/ql/test/extractor-tests/generated/Module/Module.ql
deleted file mode 100644
index fd3ba6caceb85..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Module/Module.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from Module x, int getNumberOfDeclarations
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfDeclarations = x.getNumberOfDeclarations()
-select x, "getNumberOfDeclarations:", getNumberOfDeclarations
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.expected
deleted file mode 100644
index 1441501f34e4e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-| file://:0:0:0:0 | Module | 0 | file://:0:0:0:0 | UnimplementedDeclaration |
-| file://:0:0:0:0 | Module | 0 | file://:0:0:0:0 | UnimplementedDeclaration |
-| file://:0:0:0:0 | Module | 0 | file://:0:0:0:0 | UnimplementedDeclaration |
-| file://:0:0:0:0 | Module | 0 | gen_module.rs:6:5:6:19 | baz |
-| file://:0:0:0:0 | Module | 1 | file://:0:0:0:0 | UnimplementedDeclaration |
-| file://:0:0:0:0 | Module | 1 | file://:0:0:0:0 | UnimplementedDeclaration |
-| file://:0:0:0:0 | Module | 1 | file://:0:0:0:0 | UnimplementedDeclaration |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.ql b/rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.ql
deleted file mode 100644
index 9ac42e00b23a6..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Module/Module_getDeclaration.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from Module x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getDeclaration(index)
diff --git a/rust/ql/test/extractor-tests/generated/Module/gen_module.rs b/rust/ql/test/extractor-tests/generated/Module/gen_module.rs
deleted file mode 100644
index 61af57a99bff8..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Module/gen_module.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-
-// A module declaration. For example:
-mod foo;
-mod bar {
-    pub fn baz() {}
-}
diff --git a/rust/ql/test/extractor-tests/generated/Name/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Name/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Name/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/NameRef/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NameRef/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/NeverType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NeverType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
deleted file mode 100644
index e28c61da351dd..0000000000000
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | getContainer: | file://:0:0:0:0 | TypeRef | getNumberOfFields: | 1 |
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
deleted file mode 100644
index 4cdb625caa8d9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from OffsetOfExpr x, TypeRef getContainer, int getNumberOfFields
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getContainer = x.getContainer() and
-  getNumberOfFields = x.getNumberOfFields()
-select x, "getContainer:", getContainer, "getNumberOfFields:", getNumberOfFields
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.expected
deleted file mode 100644
index 5aac2799dab66..0000000000000
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | 0 | field |
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql
deleted file mode 100644
index c5b41700f6412..0000000000000
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from OffsetOfExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getField(index)
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/gen_offset_of_expr.rs b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/gen_offset_of_expr.rs
deleted file mode 100644
index bea18741cec02..0000000000000
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/gen_offset_of_expr.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_offset_of_expr() -> () {
-    //  An `offset_of` expression. For example:
-    builtin # offset_of(Struct, field);
-}
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/OrPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/OrPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected
deleted file mode 100644
index bca61721ca455..0000000000000
--- a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_or_pat.rs:6:9:6:38 | OrPat | getNumberOfArgs: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.ql b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.ql
deleted file mode 100644
index 8eb2b245bb05e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from OrPat x, int getNumberOfArgs
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfArgs = x.getNumberOfArgs()
-select x, "getNumberOfArgs:", getNumberOfArgs
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getArg.expected b/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getArg.expected
deleted file mode 100644
index a701548b23457..0000000000000
--- a/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getArg.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_or_pat.rs:6:9:6:38 | OrPat | 0 | gen_or_pat.rs:6:9:6:23 | TupleStructPat |
-| gen_or_pat.rs:6:9:6:38 | OrPat | 1 | gen_or_pat.rs:6:27:6:38 | PathPat |
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getArg.ql b/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getArg.ql
deleted file mode 100644
index 71da1732609e5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getArg.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from OrPat x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArg(index)
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/gen_or_pat.rs b/rust/ql/test/extractor-tests/generated/OrPat/gen_or_pat.rs
deleted file mode 100644
index 76dff6b6b920a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/OrPat/gen_or_pat.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_or_pat() -> () {
-    // An or pattern. For example:
-    match x {
-        Option::Some(y) | Option::None => 0,
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/Param/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Param/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Param/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ParamList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ParamList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParamList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ParenExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ParenPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ParenType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Path/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Path/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path.expected b/rust/ql/test/extractor-tests/generated/Path/Path.expected
deleted file mode 100644
index 3e0c5eb3e26e7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Path/Path.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_path.rs:5:5:5:12 | Path |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path.ql b/rust/ql/test/extractor-tests/generated/Path/Path.ql
deleted file mode 100644
index 4e51bef1402dc..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Path/Path.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from Path x
-where toBeTested(x) and not x.isUnknown()
-select x
diff --git a/rust/ql/test/extractor-tests/generated/Path/gen_path.rs b/rust/ql/test/extractor-tests/generated/Path/gen_path.rs
deleted file mode 100644
index 3b3f054875a9f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Path/gen_path.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_path() -> () {
-    // A path. For example:
-    foo::bar;
-}
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/PathExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected
deleted file mode 100644
index 7f24b432aa239..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_path_expr.rs:5:13:5:20 | PathExpr | getPath: | gen_path_expr.rs:5:13:5:20 | Path |
-| gen_path_expr.rs:6:13:6:20 | PathExpr | getPath: | gen_path_expr.rs:6:13:6:20 | Path |
-| gen_path_expr.rs:7:13:7:20 | PathExpr | getPath: | gen_path_expr.rs:7:13:7:20 | Path |
-| gen_path_expr.rs:8:13:8:35 | PathExpr | getPath: | gen_path_expr.rs:8:13:8:35 | Path |
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.ql b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.ql
deleted file mode 100644
index d90c15fe6e460..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from PathExpr x, Path getPath
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getPath = x.getPath()
-select x, "getPath:", getPath
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/gen_path_expr.rs b/rust/ql/test/extractor-tests/generated/PathExpr/gen_path_expr.rs
deleted file mode 100644
index dfd45ebd73fce..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PathExpr/gen_path_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_path_expr() -> () {
-    // A path expression. For example:
-    let x = variable;
-    let x = foo::bar;
-    let y = <T>::foo;
-    let z = <TypeRef as Trait>::foo;
-}
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/PathPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/PathPat.expected b/rust/ql/test/extractor-tests/generated/PathPat/PathPat.expected
deleted file mode 100644
index 38e42ebfcf2f7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PathPat/PathPat.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_path_pat.rs:6:9:6:16 | PathPat | getPath: | gen_path_pat.rs:6:9:6:16 | Path |
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/PathPat.ql b/rust/ql/test/extractor-tests/generated/PathPat/PathPat.ql
deleted file mode 100644
index 49726bd7dad5f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PathPat/PathPat.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from PathPat x, Path getPath
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getPath = x.getPath()
-select x, "getPath:", getPath
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/gen_path_pat.rs b/rust/ql/test/extractor-tests/generated/PathPat/gen_path_pat.rs
deleted file mode 100644
index c54aa618ccf19..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PathPat/gen_path_pat.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_path_pat() -> () {
-    // A path pattern. For example:
-    match x {
-        Foo::Bar => "ok",
-        _ => "fail",
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/PathSegment/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathSegment/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/PathType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/PathType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PathType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/PrefixExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected
deleted file mode 100644
index 151eb7e174530..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| gen_prefix_expr.rs:5:13:5:15 | PrefixExpr | getExpr: | gen_prefix_expr.rs:5:14:5:15 | LiteralExpr | getOp: | - |
-| gen_prefix_expr.rs:6:13:6:17 | PrefixExpr | getExpr: | gen_prefix_expr.rs:6:14:6:17 | LiteralExpr | getOp: | ! |
-| gen_prefix_expr.rs:7:13:7:16 | PrefixExpr | getExpr: | gen_prefix_expr.rs:7:14:7:16 | PathExpr | getOp: | * |
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql
deleted file mode 100644
index 3105466e1df6c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from PrefixExpr x, Expr getExpr, string getOp
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr() and
-  getOp = x.getOp()
-select x, "getExpr:", getExpr, "getOp:", getOp
diff --git a/rust/ql/test/extractor-tests/generated/PrefixExpr/gen_prefix_expr.rs b/rust/ql/test/extractor-tests/generated/PrefixExpr/gen_prefix_expr.rs
deleted file mode 100644
index b3101ca64b210..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PrefixExpr/gen_prefix_expr.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_prefix_expr() -> () {
-    // A unary operation expression. For example:
-    let x = -42
-    let y = !true
-    let z = *ptr
-}
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/PtrType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PtrType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RangeExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected
deleted file mode 100644
index 12e7e47c757ef..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | hasLhs: | yes | hasRhs: | yes | isInclusive: | yes |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | hasLhs: | yes | hasRhs: | yes | isInclusive: | no |
-| gen_range_expr.rs:7:13:7:16 | RangeExpr | hasLhs: | yes | hasRhs: | no | isInclusive: | no |
-| gen_range_expr.rs:8:13:8:16 | RangeExpr | hasLhs: | no | hasRhs: | yes | isInclusive: | no |
-| gen_range_expr.rs:9:13:9:17 | RangeExpr | hasLhs: | no | hasRhs: | yes | isInclusive: | yes |
-| gen_range_expr.rs:10:13:10:14 | RangeExpr | hasLhs: | no | hasRhs: | no | isInclusive: | no |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql
deleted file mode 100644
index e48dbed5e8613..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.ql
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RangeExpr x, string hasLhs, string hasRhs, string isInclusive
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  (if x.hasLhs() then hasLhs = "yes" else hasLhs = "no") and
-  (if x.hasRhs() then hasRhs = "yes" else hasRhs = "no") and
-  if x.isInclusive() then isInclusive = "yes" else isInclusive = "no"
-select x, "hasLhs:", hasLhs, "hasRhs:", hasRhs, "isInclusive:", isInclusive
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.expected
deleted file mode 100644
index f88c18b39c2d5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:13:5:13 | LiteralExpr |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:13:6:13 | LiteralExpr |
-| gen_range_expr.rs:7:13:7:16 | RangeExpr | gen_range_expr.rs:7:13:7:14 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.ql b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.ql
deleted file mode 100644
index b05ec80e73d84..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RangeExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getLhs()
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.expected
deleted file mode 100644
index f596145bfc9da..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:17:5:18 | LiteralExpr |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:16:6:17 | LiteralExpr |
-| gen_range_expr.rs:8:13:8:16 | RangeExpr | gen_range_expr.rs:8:15:8:16 | LiteralExpr |
-| gen_range_expr.rs:9:13:9:17 | RangeExpr | gen_range_expr.rs:9:16:9:17 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.ql b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.ql
deleted file mode 100644
index 9b32e5f58255f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RangeExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getRhs()
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/gen_range_expr.rs b/rust/ql/test/extractor-tests/generated/RangeExpr/gen_range_expr.rs
deleted file mode 100644
index f51927dd3dce1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/gen_range_expr.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_range_expr() -> () {
-    // A range expression. For example:
-    let x = 1..=10;
-    let x = 1..10;
-    let x = 10..;
-    let x = ..10;
-    let x = ..=10;
-    let x = ..;
-}
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RangePat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RangePat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.expected b/rust/ql/test/extractor-tests/generated/RangePat/RangePat.expected
deleted file mode 100644
index 51b3ecd3d6851..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| gen_range_pat.rs:6:9:6:12 | RangePat | hasStart: | no | hasEnd: | yes |
-| gen_range_pat.rs:7:9:7:15 | RangePat | hasStart: | yes | hasEnd: | yes |
-| gen_range_pat.rs:8:9:8:12 | RangePat | hasStart: | yes | hasEnd: | no |
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.ql b/rust/ql/test/extractor-tests/generated/RangePat/RangePat.ql
deleted file mode 100644
index 4e366ec78207b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RangePat x, string hasStart, string hasEnd
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  (if x.hasStart() then hasStart = "yes" else hasStart = "no") and
-  if x.hasEnd() then hasEnd = "yes" else hasEnd = "no"
-select x, "hasStart:", hasStart, "hasEnd:", hasEnd
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.expected b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.expected
deleted file mode 100644
index bc0e1485b8c00..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_range_pat.rs:6:9:6:12 | RangePat | gen_range_pat.rs:6:9:6:12 | LiteralPat |
-| gen_range_pat.rs:7:9:7:15 | RangePat | gen_range_pat.rs:7:9:7:15 | LiteralPat |
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.ql b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.ql
deleted file mode 100644
index 61a27c7754388..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RangePat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getEnd()
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.expected b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.expected
deleted file mode 100644
index fe4a876680a3a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_range_pat.rs:7:9:7:15 | RangePat | gen_range_pat.rs:7:9:7:15 | LiteralPat |
-| gen_range_pat.rs:8:9:8:12 | RangePat | gen_range_pat.rs:8:9:8:12 | LiteralPat |
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.ql b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.ql
deleted file mode 100644
index 29bbeda81cf15..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RangePat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getStart()
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/gen_range_pat.rs b/rust/ql/test/extractor-tests/generated/RangePat/gen_range_pat.rs
deleted file mode 100644
index 85971069de47d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RangePat/gen_range_pat.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_range_pat() -> () {
-    // A range pattern. For example:
-    match x {
-        ..15 => "too cold",
-        16..=25 => "just right",
-        26.. => "too hot",
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RecordExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected
deleted file mode 100644
index e5759d93ad868..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_record_expr.rs:5:17:5:34 | RecordExpr | hasPath: | yes | getNumberOfFlds: | 2 | hasSpread: | no | hasEllipsis: | no | isAssigneeExpr: | no |
-| gen_record_expr.rs:6:18:6:38 | RecordExpr | hasPath: | yes | getNumberOfFlds: | 1 | hasSpread: | yes | hasEllipsis: | yes | isAssigneeExpr: | no |
-| gen_record_expr.rs:7:5:7:22 | RecordExpr | hasPath: | yes | getNumberOfFlds: | 2 | hasSpread: | no | hasEllipsis: | no | isAssigneeExpr: | yes |
-| gen_record_expr.rs:8:5:8:14 | RecordExpr | hasPath: | yes | getNumberOfFlds: | 0 | hasSpread: | no | hasEllipsis: | yes | isAssigneeExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql
deleted file mode 100644
index bafc195a85ce7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.ql
+++ /dev/null
@@ -1,17 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from
-  RecordExpr x, string hasPath, int getNumberOfFlds, string hasSpread, string hasEllipsis,
-  string isAssigneeExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
-  getNumberOfFlds = x.getNumberOfFlds() and
-  (if x.hasSpread() then hasSpread = "yes" else hasSpread = "no") and
-  (if x.hasEllipsis() then hasEllipsis = "yes" else hasEllipsis = "no") and
-  if x.isAssigneeExpr() then isAssigneeExpr = "yes" else isAssigneeExpr = "no"
-select x, "hasPath:", hasPath, "getNumberOfFlds:", getNumberOfFlds, "hasSpread:", hasSpread,
-  "hasEllipsis:", hasEllipsis, "isAssigneeExpr:", isAssigneeExpr
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.expected
deleted file mode 100644
index f020086a8f77b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| gen_record_expr.rs:5:17:5:34 | RecordExpr | 0 | gen_record_expr.rs:5:26:5:26 | RecordExprField |
-| gen_record_expr.rs:5:17:5:34 | RecordExpr | 1 | gen_record_expr.rs:5:32:5:32 | RecordExprField |
-| gen_record_expr.rs:6:18:6:38 | RecordExpr | 0 | gen_record_expr.rs:6:27:6:27 | RecordExprField |
-| gen_record_expr.rs:7:5:7:22 | RecordExpr | 0 | gen_record_expr.rs:7:14:7:14 | RecordExprField |
-| gen_record_expr.rs:7:5:7:22 | RecordExpr | 1 | gen_record_expr.rs:7:20:7:20 | RecordExprField |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.ql
deleted file mode 100644
index 74231c780e989..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getFld.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getFld(index)
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected
deleted file mode 100644
index e49dd014e305e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_record_expr.rs:5:17:5:34 | RecordExpr | gen_record_expr.rs:5:17:5:34 | Path |
-| gen_record_expr.rs:6:18:6:38 | RecordExpr | gen_record_expr.rs:6:18:6:38 | Path |
-| gen_record_expr.rs:7:5:7:22 | RecordExpr | gen_record_expr.rs:7:5:7:22 | Path |
-| gen_record_expr.rs:8:5:8:14 | RecordExpr | gen_record_expr.rs:8:5:8:14 | Path |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql
deleted file mode 100644
index ebebf557e691d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.expected
deleted file mode 100644
index ae380aa5d662c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_record_expr.rs:6:18:6:38 | RecordExpr | gen_record_expr.rs:6:32:6:36 | PathExpr |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.ql b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.ql
deleted file mode 100644
index 71bef136e76e6..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getSpread()
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/gen_record_expr.rs b/rust/ql/test/extractor-tests/generated/RecordExpr/gen_record_expr.rs
deleted file mode 100644
index 94742ca3bd509..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/gen_record_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_expr() -> () {
-    // A record expression. For example:
-    let first = Foo { a: 1, b: 2 };
-    let second = Foo { a: 2, ..first };
-    Foo { a: 1, b: 2 }[2] = 10;
-    Foo { .. } = second;
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RecordExprField/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
deleted file mode 100644
index 10165f69cfda8..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_record_expr_field.rs:5:14:5:14 | RecordExprField | getName: | a | getExpr: | gen_record_expr_field.rs:5:14:5:14 | LiteralExpr |
-| gen_record_expr_field.rs:5:20:5:20 | RecordExprField | getName: | b | getExpr: | gen_record_expr_field.rs:5:20:5:20 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.ql b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.ql
deleted file mode 100644
index 87eaf9b6c0a72..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordExprField x, string getName, Expr getExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getName = x.getName() and
-  getExpr = x.getExpr()
-select x, "getName:", getName, "getExpr:", getExpr
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/gen_record_expr_field.rs b/rust/ql/test/extractor-tests/generated/RecordExprField/gen_record_expr_field.rs
deleted file mode 100644
index 6311fc03b0089..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/gen_record_expr_field.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_expr_field() -> () {
-    // A field in a record expression. For example `a: 1` in:
-    Foo { a: 1, b: 2 };
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RecordField/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordField/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RecordFieldList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordFieldList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RecordPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected
deleted file mode 100644
index c6abe134f6719..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_record_pat.rs:6:9:6:26 | RecordPat | hasPath: | yes | getNumberOfFlds: | 2 | hasEllipsis: | no |
-| gen_record_pat.rs:7:9:7:18 | RecordPat | hasPath: | yes | getNumberOfFlds: | 0 | hasEllipsis: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql
deleted file mode 100644
index 95372dd9634ae..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.ql
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPat x, string hasPath, int getNumberOfFlds, string hasEllipsis
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
-  getNumberOfFlds = x.getNumberOfFlds() and
-  if x.hasEllipsis() then hasEllipsis = "yes" else hasEllipsis = "no"
-select x, "hasPath:", hasPath, "getNumberOfFlds:", getNumberOfFlds, "hasEllipsis:", hasEllipsis
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.expected
deleted file mode 100644
index d99c027de911b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_record_pat.rs:6:9:6:26 | RecordPat | 0 | gen_record_pat.rs:6:18:6:18 | RecordPatField |
-| gen_record_pat.rs:6:9:6:26 | RecordPat | 1 | gen_record_pat.rs:6:24:6:24 | RecordPatField |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.ql
deleted file mode 100644
index c5b7e9ed43981..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getFld.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPat x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getFld(index)
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected
deleted file mode 100644
index 0dfc1cf99cb75..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_record_pat.rs:6:9:6:26 | RecordPat | gen_record_pat.rs:6:9:6:26 | Path |
-| gen_record_pat.rs:7:9:7:18 | RecordPat | gen_record_pat.rs:7:9:7:18 | Path |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql
deleted file mode 100644
index 90685024029a7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/gen_record_pat.rs b/rust/ql/test/extractor-tests/generated/RecordPat/gen_record_pat.rs
deleted file mode 100644
index 87b0fcd5e0dc6..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPat/gen_record_pat.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_pat() -> () {
-    // A record pattern. For example:
-    match x {
-        Foo { a: 1, b: 2 } => "ok",
-        Foo { .. } => "fail",
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RecordPatField/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatField/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.expected b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.expected
deleted file mode 100644
index 8941bd466d368..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_record_pat_field.rs:5:18:5:18 | RecordPatField | getName: | a | getPat: | gen_record_pat_field.rs:5:18:5:18 | LiteralPat |
-| gen_record_pat_field.rs:5:24:5:24 | RecordPatField | getName: | b | getPat: | gen_record_pat_field.rs:5:24:5:24 | LiteralPat |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql
deleted file mode 100644
index 96d613dee7694..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RecordPatField x, string getName, Pat getPat
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getName = x.getName() and
-  getPat = x.getPat()
-select x, "getName:", getName, "getPat:", getPat
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/gen_record_pat_field.rs b/rust/ql/test/extractor-tests/generated/RecordPatField/gen_record_pat_field.rs
deleted file mode 100644
index 4e1e358e3a094..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/gen_record_pat_field.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_record_pat_field() -> () {
-    // A field in a record pattern. For example `a: 1` in:
-    let Foo { a: 1, b: 2 } = foo;
-}
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RefExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected
deleted file mode 100644
index b2b75ae61e14a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_ref_expr.rs:5:25:5:28 | RefExpr | getExpr: | gen_ref_expr.rs:5:26:5:28 | PathExpr | isRaw: | no | isMut: | no |
-| gen_ref_expr.rs:6:23:6:30 | RefExpr | getExpr: | gen_ref_expr.rs:6:28:6:30 | PathExpr | isRaw: | no | isMut: | yes |
-| gen_ref_expr.rs:7:35:7:48 | RefExpr | getExpr: | gen_ref_expr.rs:7:46:7:48 | PathExpr | isRaw: | yes | isMut: | no |
-| gen_ref_expr.rs:8:33:8:44 | RefExpr | getExpr: | gen_ref_expr.rs:8:42:8:44 | PathExpr | isRaw: | yes | isMut: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql
deleted file mode 100644
index 447235d74a735..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.ql
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RefExpr x, Expr getExpr, string isRaw, string isMut
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getExpr = x.getExpr() and
-  (if x.isRaw() then isRaw = "yes" else isRaw = "no") and
-  if x.isMut() then isMut = "yes" else isMut = "no"
-select x, "getExpr:", getExpr, "isRaw:", isRaw, "isMut:", isMut
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/gen_ref_expr.rs b/rust/ql/test/extractor-tests/generated/RefExpr/gen_ref_expr.rs
deleted file mode 100644
index bb2f9c36b708b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RefExpr/gen_ref_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_ref_expr() -> () {
-    // A reference expression. For example:
-        let ref_const = &foo;
-        let ref_mut = &mut foo;
-        let raw_const: &mut i32 = &raw const foo;
-        let raw_mut: &mut i32 = &raw mut foo;
-}
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RefPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
deleted file mode 100644
index 095e9af1d6f01..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_ref_pat.rs:6:9:6:28 | RefPat | getPat: | gen_ref_pat.rs:6:14:6:28 | TupleStructPat | isMut: | yes |
-| gen_ref_pat.rs:7:9:7:21 | RefPat | getPat: | gen_ref_pat.rs:7:10:7:21 | PathPat | isMut: | no |
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql
deleted file mode 100644
index 51707e7df3a77..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RefPat x, Pat getPat, string isMut
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getPat = x.getPat() and
-  if x.isMut() then isMut = "yes" else isMut = "no"
-select x, "getPat:", getPat, "isMut:", isMut
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/gen_ref_pat.rs b/rust/ql/test/extractor-tests/generated/RefPat/gen_ref_pat.rs
deleted file mode 100644
index 1eeac44753f05..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RefPat/gen_ref_pat.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_ref_pat() -> () {
-    // A reference pattern. For example:
-    match x {
-        &mut Option::Some(y) => y,
-        &Option::None => 0,
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/RefType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RefType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Rename/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Rename/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Rename/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.expected b/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.expected
deleted file mode 100644
index 370729af71d02..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_repeat_expr.rs:5:5:5:11 | RepeatExpr | getInitializer: | gen_repeat_expr.rs:5:6:5:6 | LiteralExpr | getRepeat: | gen_repeat_expr.rs:5:9:5:10 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.ql b/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.ql
deleted file mode 100644
index 2b6ec3ca337ab..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RepeatExpr x, Expr getInitializer, Expr getRepeat
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getInitializer = x.getInitializer() and
-  getRepeat = x.getRepeat()
-select x, "getInitializer:", getInitializer, "getRepeat:", getRepeat
diff --git a/rust/ql/test/extractor-tests/generated/RepeatExpr/gen_repeat_expr.rs b/rust/ql/test/extractor-tests/generated/RepeatExpr/gen_repeat_expr.rs
deleted file mode 100644
index 7eac4d424b13d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RepeatExpr/gen_repeat_expr.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_repeat_expr() -> () {
-    // A repeat expression. For example:
-    [1; 10];
-}
diff --git a/rust/ql/test/extractor-tests/generated/RestPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RestPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RestPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/RetType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/RetType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ReturnExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ReturnExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected
deleted file mode 100644
index d715c0cb6641f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_return_expr.rs:5:5:5:13 | ReturnExpr | hasExpr: | yes |
-| gen_return_expr.rs:8:5:8:10 | ReturnExpr | hasExpr: | no |
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql
deleted file mode 100644
index c648bb6a16d80..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ReturnExpr x, string hasExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
-select x, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected
deleted file mode 100644
index 4247069ccc253..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_return_expr.rs:5:5:5:13 | ReturnExpr | gen_return_expr.rs:5:12:5:13 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql
deleted file mode 100644
index 8f682d7a5b1ea..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ReturnExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/gen_return_expr.rs b/rust/ql/test/extractor-tests/generated/ReturnExpr/gen_return_expr.rs
deleted file mode 100644
index 16da919ab3137..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/gen_return_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-// A return expression. For example:
-fn some_value() -> i32 {
-    return 42;
-}
-fn no_value() -> () {
-    return;
-}
diff --git a/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/SelfParam/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/SlicePat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SlicePat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.expected b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.expected
deleted file mode 100644
index 96aa9c9cb287c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | getNumberOfPrefixes: | 5 | hasSlice: | no | getNumberOfSuffixes: | 0 |
-| gen_slice_pat.rs:7:9:7:18 | SlicePat | getNumberOfPrefixes: | 2 | hasSlice: | yes | getNumberOfSuffixes: | 0 |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | getNumberOfPrefixes: | 2 | hasSlice: | yes | getNumberOfSuffixes: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.ql b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.ql
deleted file mode 100644
index 0ab0d4bb0ce6c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat.ql
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from SlicePat x, int getNumberOfPrefixes, string hasSlice, int getNumberOfSuffixes
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfPrefixes = x.getNumberOfPrefixes() and
-  (if x.hasSlice() then hasSlice = "yes" else hasSlice = "no") and
-  getNumberOfSuffixes = x.getNumberOfSuffixes()
-select x, "getNumberOfPrefixes:", getNumberOfPrefixes, "hasSlice:", hasSlice,
-  "getNumberOfSuffixes:", getNumberOfSuffixes
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.expected b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.expected
deleted file mode 100644
index 763ef8783b4ef..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | 0 | gen_slice_pat.rs:6:10:6:10 | LiteralPat |
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | 1 | gen_slice_pat.rs:6:13:6:13 | LiteralPat |
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | 2 | gen_slice_pat.rs:6:16:6:16 | LiteralPat |
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | 3 | gen_slice_pat.rs:6:19:6:19 | LiteralPat |
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | 4 | gen_slice_pat.rs:6:22:6:22 | LiteralPat |
-| gen_slice_pat.rs:7:9:7:18 | SlicePat | 0 | gen_slice_pat.rs:7:10:7:10 | LiteralPat |
-| gen_slice_pat.rs:7:9:7:18 | SlicePat | 1 | gen_slice_pat.rs:7:13:7:13 | LiteralPat |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 0 | gen_slice_pat.rs:8:10:8:10 | IdentPat |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 1 | gen_slice_pat.rs:8:13:8:13 | IdentPat |
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.ql b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.ql
deleted file mode 100644
index 983f11337302e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPrefix.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from SlicePat x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getPrefix(index)
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.expected b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.expected
deleted file mode 100644
index 1e0f4586250fc..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_slice_pat.rs:7:9:7:18 | SlicePat | gen_slice_pat.rs:7:16:7:17 | MissingPat |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | gen_slice_pat.rs:8:16:8:17 | MissingPat |
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.ql b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.ql
deleted file mode 100644
index 6e4ae62cf1712..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSlice.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from SlicePat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getSlice()
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.expected b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.expected
deleted file mode 100644
index a815226345a9a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 0 | gen_slice_pat.rs:8:20:8:20 | IdentPat |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 1 | gen_slice_pat.rs:8:23:8:23 | LiteralPat |
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.ql b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.ql
deleted file mode 100644
index 351f3ffcdffe8..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getSuffix.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from SlicePat x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getSuffix(index)
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/gen_slice_pat.rs b/rust/ql/test/extractor-tests/generated/SlicePat/gen_slice_pat.rs
deleted file mode 100644
index afdd4206b285d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SlicePat/gen_slice_pat.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_slice_pat() -> () {
-    // A slice pattern. For example:
-    match x {
-        [1, 2, 3, 4, 5] => "ok",
-        [1, 2, ..] => "fail",
-        [x, y, .., z, 7] => "fail",
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/SliceType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SliceType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/SourceFile/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Static/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Static/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Static/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/StmtList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/StmtList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Struct/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Struct/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Struct/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TokenTree/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TokenTree/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TokenTree/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Trait/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Trait/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Trait/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TraitAlias/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TryExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TryExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TupleExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected
deleted file mode 100644
index 9522fe8750dfe..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | getNumberOfExprs: | 2 | isAssigneeExpr: | no |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | getNumberOfExprs: | 2 | isAssigneeExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql
deleted file mode 100644
index 1020f4d101d12..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TupleExpr x, int getNumberOfExprs, string isAssigneeExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfExprs = x.getNumberOfExprs() and
-  if x.isAssigneeExpr() then isAssigneeExpr = "yes" else isAssigneeExpr = "no"
-select x, "getNumberOfExprs:", getNumberOfExprs, "isAssigneeExpr:", isAssigneeExpr
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.expected
deleted file mode 100644
index 936d2a39bb27f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 0 | gen_tuple_expr.rs:5:6:5:6 | LiteralExpr |
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 1 | gen_tuple_expr.rs:5:9:5:13 | LiteralExpr |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 0 | gen_tuple_expr.rs:6:6:6:6 | LiteralExpr |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 1 | gen_tuple_expr.rs:6:9:6:13 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.ql
deleted file mode 100644
index dbb8beef002aa..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TupleExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getExpr(index)
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/gen_tuple_expr.rs b/rust/ql/test/extractor-tests/generated/TupleExpr/gen_tuple_expr.rs
deleted file mode 100644
index 7aa2b235a804f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/gen_tuple_expr.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_tuple_expr() -> () {
-    // A tuple expression. For example:
-    (1, "one");
-    (2, "two")[0] = 3;
-}
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TupleField/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleField/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TupleFieldList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TupleFieldList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleFieldList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TuplePat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TuplePat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.expected b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.expected
deleted file mode 100644
index 393cbfdda381d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_tuple_pat.rs:5:9:5:14 | TuplePat | getNumberOfArgs: | 2 | hasEllipsisIndex: | no |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | getNumberOfArgs: | 3 | hasEllipsisIndex: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.ql b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.ql
deleted file mode 100644
index 7d6ce9fcb6a96..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TuplePat x, int getNumberOfArgs, string hasEllipsisIndex
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfArgs = x.getNumberOfArgs() and
-  if x.hasEllipsisIndex() then hasEllipsisIndex = "yes" else hasEllipsisIndex = "no"
-select x, "getNumberOfArgs:", getNumberOfArgs, "hasEllipsisIndex:", hasEllipsisIndex
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.expected b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.expected
deleted file mode 100644
index 993b348b4ee9e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| gen_tuple_pat.rs:5:9:5:14 | TuplePat | 0 | gen_tuple_pat.rs:5:10:5:10 | IdentPat |
-| gen_tuple_pat.rs:5:9:5:14 | TuplePat | 1 | gen_tuple_pat.rs:5:13:5:13 | IdentPat |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 0 | gen_tuple_pat.rs:6:10:6:10 | IdentPat |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 1 | gen_tuple_pat.rs:6:13:6:13 | IdentPat |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 2 | gen_tuple_pat.rs:6:21:6:21 | IdentPat |
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.ql b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.ql
deleted file mode 100644
index 927b8212c4f85..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getArg.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TuplePat x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArg(index)
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.expected b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.expected
deleted file mode 100644
index 7248cb17ab332..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.ql b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.ql
deleted file mode 100644
index 442912b721e0a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getEllipsisIndex.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TuplePat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getEllipsisIndex()
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/gen_tuple_pat.rs b/rust/ql/test/extractor-tests/generated/TuplePat/gen_tuple_pat.rs
deleted file mode 100644
index 9fc2ab60fc603..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TuplePat/gen_tuple_pat.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_tuple_pat() -> () {
-    // A tuple pattern. For example:
-    let (x, y) = (1, 2);
-    let (a, b, ..,  z) = (1, 2, 3, 4, 5);
-}
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TupleStructPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
deleted file mode 100644
index 03ce4b8082d9e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | hasPath: | yes | getNumberOfArgs: | 4 | hasEllipsisIndex: | no |
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | hasPath: | yes | getNumberOfArgs: | 1 | hasEllipsisIndex: | yes |
-| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | hasPath: | yes | getNumberOfArgs: | 0 | hasEllipsisIndex: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql
deleted file mode 100644
index e46934a81f49d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql
+++ /dev/null
@@ -1,13 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TupleStructPat x, string hasPath, int getNumberOfArgs, string hasEllipsisIndex
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  (if x.hasPath() then hasPath = "yes" else hasPath = "no") and
-  getNumberOfArgs = x.getNumberOfArgs() and
-  if x.hasEllipsisIndex() then hasEllipsisIndex = "yes" else hasEllipsisIndex = "no"
-select x, "hasPath:", hasPath, "getNumberOfArgs:", getNumberOfArgs, "hasEllipsisIndex:",
-  hasEllipsisIndex
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.expected
deleted file mode 100644
index 2a1a163a5aad1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | 0 | gen_tuple_struct_pat.rs:6:15:6:17 | LiteralPat |
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | 1 | gen_tuple_struct_pat.rs:6:20:6:20 | LiteralPat |
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | 2 | gen_tuple_struct_pat.rs:6:23:6:23 | LiteralPat |
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | 3 | gen_tuple_struct_pat.rs:6:26:6:26 | LiteralPat |
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | 0 | gen_tuple_struct_pat.rs:7:19:7:19 | LiteralPat |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.ql
deleted file mode 100644
index 77622933e700b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TupleStructPat x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getArg(index)
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.expected
deleted file mode 100644
index 96cb3797a6294..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | 0 |
-| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.ql
deleted file mode 100644
index f31fb1a9342d4..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TupleStructPat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getEllipsisIndex()
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected
deleted file mode 100644
index de7f0f1ffe062..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | gen_tuple_struct_pat.rs:6:9:6:27 | Path |
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | gen_tuple_struct_pat.rs:7:9:7:20 | Path |
-| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | gen_tuple_struct_pat.rs:8:9:8:17 | Path |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql
deleted file mode 100644
index bc5318bc10367..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TupleStructPat x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/gen_tuple_struct_pat.rs b/rust/ql/test/extractor-tests/generated/TupleStructPat/gen_tuple_struct_pat.rs
deleted file mode 100644
index 0a55ce743f993..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/gen_tuple_struct_pat.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_tuple_struct_pat() -> () {
-    // A tuple struct pattern. For example:
-    match x {
-        Tuple("a", 1, 2, 3) => "great",
-        Tuple(.., 3) => "fine",
-        Tuple(..) => "fail",
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TupleType/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleType/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TypeAlias/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TypeArg/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeArg/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TypeBound/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TypeBoundList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeBoundList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/TypeParam/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TypeParam/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.expected b/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.expected
deleted file mode 100644
index af51fa0b6032f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| file://:0:0:0:0 | TypeRef |
-| file://:0:0:0:0 | TypeRef |
-| file://:0:0:0:0 | TypeRef |
diff --git a/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.ql b/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.ql
deleted file mode 100644
index ef4a4c96806f9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from TypeRef x
-where toBeTested(x) and not x.isUnknown()
-select x
diff --git a/rust/ql/test/extractor-tests/generated/TypeRef/gen_type_ref.rs b/rust/ql/test/extractor-tests/generated/TypeRef/gen_type_ref.rs
deleted file mode 100644
index 0c7c71df23555..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeRef/gen_type_ref.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_type_ref() -> () {
-    // The base class for type references.
-    let x: i32;
-    let y: Vec<i32>;
-    let z: Option<i32>;
-}
diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected
deleted file mode 100644
index b81aa1f81b082..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_underscore_expr.rs:5:5:5:5 | UnderscoreExpr |
diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql
deleted file mode 100644
index c3ad706b805c0..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from UnderscoreExpr x
-where toBeTested(x) and not x.isUnknown()
-select x
diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/gen_underscore_expr.rs b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/gen_underscore_expr.rs
deleted file mode 100644
index 62ce1d4500cd5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/gen_underscore_expr.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_underscore_expr() -> () {
-    // An underscore expression. For example:
-    _ = 42;
-}
diff --git a/rust/ql/test/extractor-tests/generated/Union/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Union/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Union/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.expected b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.expected
deleted file mode 100644
index 2fb952294e6e2..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_unsafe_block_expr.rs:5:18:8:5 | UnsafeBlockExpr | getNumberOfStatements: | 1 | hasTail: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql
deleted file mode 100644
index 30da2bbc0ef3e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from UnsafeBlockExpr x, int getNumberOfStatements, string hasTail
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfStatements = x.getNumberOfStatements() and
-  if x.hasTail() then hasTail = "yes" else hasTail = "no"
-select x, "getNumberOfStatements:", getNumberOfStatements, "hasTail:", hasTail
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.expected b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.expected
deleted file mode 100644
index a9c91832300cd..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_unsafe_block_expr.rs:5:18:8:5 | UnsafeBlockExpr | 0 | gen_unsafe_block_expr.rs:6:13:6:13 | LetStmt |
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql
deleted file mode 100644
index 5fa1d4ad7793e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from UnsafeBlockExpr x, int index
-where toBeTested(x) and not x.isUnknown()
-select x, index, x.getStatement(index)
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.expected b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.expected
deleted file mode 100644
index c0d12ae28a5b4..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_unsafe_block_expr.rs:5:18:8:5 | UnsafeBlockExpr | gen_unsafe_block_expr.rs:7:9:7:54 | CallExpr |
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.ql b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.ql
deleted file mode 100644
index 24ed95ca9b16e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from UnsafeBlockExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTail()
diff --git a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/gen_unsafe_block_expr.rs b/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/gen_unsafe_block_expr.rs
deleted file mode 100644
index 0beaf5ef644a2..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UnsafeBlockExpr/gen_unsafe_block_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_unsafe_block_expr() -> () {
-    // An unsafe block expression. For example:
-    let layout = unsafe {
-        let x = 42;
-        Layout::from_size_align_unchecked(size, align)
-    };
-}
diff --git a/rust/ql/test/extractor-tests/generated/Use/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Use/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Use/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/UseTree/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTree/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/UseTreeList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/UseTreeList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/UseTreeList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Variant/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Variant/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/VariantList/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/VariantList/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/VariantList/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/Visibility/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/Visibility/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Visibility/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/WhereClause/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/WhereClause/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhereClause/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/WherePred/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WherePred/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/WhileExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WhileExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/WildcardPat/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/WildcardPat/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/WildcardPat/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.expected b/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.expected
deleted file mode 100644
index ceb155671b7fc..0000000000000
--- a/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_wildcard_pat.rs:5:9:5:9 | WildcardPat |
diff --git a/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.ql b/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.ql
deleted file mode 100644
index cac335f3b7fcf..0000000000000
--- a/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from WildcardPat x
-where toBeTested(x) and not x.isUnknown()
-select x
diff --git a/rust/ql/test/extractor-tests/generated/WildcardPat/gen_wildcard_pat.rs b/rust/ql/test/extractor-tests/generated/WildcardPat/gen_wildcard_pat.rs
deleted file mode 100644
index 4d29caca3f07f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/WildcardPat/gen_wildcard_pat.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_wildcard_pat() -> () {
-    // A wildcard pattern. For example:
-    let _ = 42;
-}
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/YeetExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/YeetExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.expected b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.expected
deleted file mode 100644
index bda4e84abfd99..0000000000000
--- a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_yeet_expr.rs:6:8:6:36 | YeetExpr | hasExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql
deleted file mode 100644
index 2b8d7e27610ca..0000000000000
--- a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from YeetExpr x, string hasExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
-select x, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.expected
deleted file mode 100644
index 074c6fbff74c1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_yeet_expr.rs:6:8:6:36 | YeetExpr | gen_yeet_expr.rs:6:16:6:36 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.ql
deleted file mode 100644
index edb0e0676a7a1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from YeetExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/YeetExpr/gen_yeet_expr.rs b/rust/ql/test/extractor-tests/generated/YeetExpr/gen_yeet_expr.rs
deleted file mode 100644
index 52c8026e7908a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/YeetExpr/gen_yeet_expr.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_yeet_expr() -> () {
-    // A `yeet` expression. For example:
-    if x < size {
-       do yeet "index out of bounds";
-    }
-}
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/MISSING_SOURCE.txt b/rust/ql/test/extractor-tests/generated/YieldExpr/MISSING_SOURCE.txt
new file mode 100644
index 0000000000000..7f96b17b1f3ce
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/YieldExpr/MISSING_SOURCE.txt
@@ -0,0 +1,4 @@
+// generated by codegen, do not edit
+
+After a source file is added in this directory and codegen is run again, test queries
+will appear and this file will be deleted
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.expected b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.expected
deleted file mode 100644
index e897a88bb2404..0000000000000
--- a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_yield_expr.rs:7:13:7:19 | YieldExpr | hasExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql
deleted file mode 100644
index bec12938c9157..0000000000000
--- a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from YieldExpr x, string hasExpr
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
-select x, "hasExpr:", hasExpr
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.expected
deleted file mode 100644
index 87b88ef24196d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_yield_expr.rs:7:13:7:19 | YieldExpr | gen_yield_expr.rs:7:19:7:19 | LiteralExpr |
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.ql
deleted file mode 100644
index bdaa4755e6d3d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from YieldExpr x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getExpr()
diff --git a/rust/ql/test/extractor-tests/generated/YieldExpr/gen_yield_expr.rs b/rust/ql/test/extractor-tests/generated/YieldExpr/gen_yield_expr.rs
deleted file mode 100644
index e793107309dcf..0000000000000
--- a/rust/ql/test/extractor-tests/generated/YieldExpr/gen_yield_expr.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_yield_expr() -> () {
-    // A `yield` expression. For example:
-    let one = #[coroutine]
-        || {
-            yield 1;
-        };
-}