Regenerate code

2026-04-24 08:15:14 +02:00 · 2024-09-13 10:52:43 +02:00
parent 8dcf93d065
commit fa9cfc1104
100 changed files with 1384 additions and 1401 deletions
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 7cdfedcd68cf8e41134daf810c1af78624082b0c3e8be6570339b1a69a5d457e 7cdfedcd68cf8e41134daf810c1af78624082b0c3e8be6570339b1a69a5d457e
-top.rs a165d9d38458fa0a4fa07445bb4229d17c2be47d0718e4b0ac9f7a82e700c8b2 a165d9d38458fa0a4fa07445bb4229d17c2be47d0718e4b0ac9f7a82e700c8b2
+top.rs c0701de6b3caad020b72b275d83209e6fff0771f84fb94a816921ae7ca7fd3df c0701de6b3caad020b72b275d83209e6fff0771f84fb94a816921ae7ca7fd3df
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -44,18 +44,18 @@ impl TrapEntry for DbLocation {
 }

 #[derive(Debug)]
-pub struct GenericArgs {
+pub struct GenericArgList {
    pub id: TrapId,
    pub location: Option<trap::Label>,
 }

-impl TrapEntry for GenericArgs {
+impl TrapEntry for GenericArgList {
    fn extract_id(&mut self) -> TrapId {
        std::mem::replace(&mut self.id, TrapId::Star)
    }

    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("generic_args", vec![trap::Arg::Label(id)]);
+        out.add_tuple("generic_arg_lists", vec![trap::Arg::Label(id)]);
        if let Some(v) = self.location {
            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
        }
@@ -127,41 +127,20 @@ impl TrapEntry for Path {
 }

 #[derive(Debug)]
-pub struct RecordFieldPat {
-    pub id: TrapId,
-    pub location: Option<trap::Label>,
-    pub name: String,
-    pub pat: trap::Label,
-}
-
-impl TrapEntry for RecordFieldPat {
-    fn extract_id(&mut self) -> TrapId {
-        std::mem::replace(&mut self.id, TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("record_field_pats", vec![trap::Arg::Label(id), self.name.into(), self.pat.into()]);
-        if let Some(v) = self.location {
-            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct RecordLitField {
+pub struct RecordExprField {
    pub id: TrapId,
    pub location: Option<trap::Label>,
    pub name: String,
    pub expr: trap::Label,
 }

-impl TrapEntry for RecordLitField {
+impl TrapEntry for RecordExprField {
    fn extract_id(&mut self) -> TrapId {
        std::mem::replace(&mut self.id, TrapId::Star)
    }

    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("record_lit_fields", vec![trap::Arg::Label(id), self.name.into(), self.expr.into()]);
+        out.add_tuple("record_expr_fields", vec![trap::Arg::Label(id), self.name.into(), self.expr.into()]);
        if let Some(v) = self.location {
            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
        }
@@ -169,18 +148,59 @@ impl TrapEntry for RecordLitField {
 }

 #[derive(Debug)]
-pub struct TypeRef {
+pub struct RecordPatField {
    pub id: TrapId,
    pub location: Option<trap::Label>,
+    pub name: String,
+    pub pat: trap::Label,
 }

-impl TrapEntry for TypeRef {
+impl TrapEntry for RecordPatField {
    fn extract_id(&mut self) -> TrapId {
        std::mem::replace(&mut self.id, TrapId::Star)
    }

    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("type_refs", vec![trap::Arg::Label(id)]);
+        out.add_tuple("record_pat_fields", vec![trap::Arg::Label(id), self.name.into(), self.pat.into()]);
+        if let Some(v) = self.location {
+            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Type {
+    pub id: TrapId,
+    pub location: Option<trap::Label>,
+}
+
+impl TrapEntry for Type {
+    fn extract_id(&mut self) -> TrapId {
+        std::mem::replace(&mut self.id, TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
+        out.add_tuple("types", vec![trap::Arg::Label(id)]);
+        if let Some(v) = self.location {
+            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct AsmExpr {
+    pub id: TrapId,
+    pub location: Option<trap::Label>,
+    pub expr: trap::Label,
+}
+
+impl TrapEntry for AsmExpr {
+    fn extract_id(&mut self) -> TrapId {
+        std::mem::replace(&mut self.id, TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
+        out.add_tuple("asm_exprs", vec![trap::Arg::Label(id), self.expr.into()]);
        if let Some(v) = self.location {
            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
        }
@@ -228,7 +248,7 @@ impl TrapEntry for BecomeExpr {
 }

 #[derive(Debug)]
-pub struct BinaryOpExpr {
+pub struct BinExpr {
    pub id: TrapId,
    pub location: Option<trap::Label>,
    pub lhs: trap::Label,
@@ -236,42 +256,18 @@ pub struct BinaryOpExpr {
    pub op: Option<String>,
 }

-impl TrapEntry for BinaryOpExpr {
+impl TrapEntry for BinExpr {
    fn extract_id(&mut self) -> TrapId {
        std::mem::replace(&mut self.id, TrapId::Star)
    }

    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("binary_op_exprs", vec![trap::Arg::Label(id), self.lhs.into(), self.rhs.into()]);
+        out.add_tuple("bin_exprs", vec![trap::Arg::Label(id), self.lhs.into(), self.rhs.into()]);
        if let Some(v) = self.location {
            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
        }
        if let Some(v) = self.op {
-            out.add_tuple("binary_op_expr_ops", vec![trap::Arg::Label(id), v.into()]);
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct BindPat {
-    pub id: TrapId,
-    pub location: Option<trap::Label>,
-    pub binding_id: String,
-    pub subpat: Option<trap::Label>,
-}
-
-impl TrapEntry for BindPat {
-    fn extract_id(&mut self) -> TrapId {
-        std::mem::replace(&mut self.id, TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("bind_pats", vec![trap::Arg::Label(id), self.binding_id.into()]);
-        if let Some(v) = self.location {
-            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
-        }
-        if let Some(v) = self.subpat {
-            out.add_tuple("bind_pat_subpats", vec![trap::Arg::Label(id), v.into()]);
+            out.add_tuple("bin_expr_ops", vec![trap::Arg::Label(id), v.into()]);
        }
    }
 }
@@ -376,7 +372,7 @@ pub struct CastExpr {
    pub id: TrapId,
    pub location: Option<trap::Label>,
    pub expr: trap::Label,
-    pub type_ref: trap::Label,
+    pub type_: trap::Label,
 }

 impl TrapEntry for CastExpr {
@@ -385,7 +381,7 @@ impl TrapEntry for CastExpr {
    }

    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("cast_exprs", vec![trap::Arg::Label(id), self.expr.into(), self.type_ref.into()]);
+        out.add_tuple("cast_exprs", vec![trap::Arg::Label(id), self.expr.into(), self.type_.into()]);
        if let Some(v) = self.location {
            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
        }
@@ -560,6 +556,30 @@ impl TrapEntry for Function {
    }
 }

+#[derive(Debug)]
+pub struct IdentPat {
+    pub id: TrapId,
+    pub location: Option<trap::Label>,
+    pub binding_id: String,
+    pub subpat: Option<trap::Label>,
+}
+
+impl TrapEntry for IdentPat {
+    fn extract_id(&mut self) -> TrapId {
+        std::mem::replace(&mut self.id, TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
+        out.add_tuple("ident_pats", vec![trap::Arg::Label(id), self.binding_id.into()]);
+        if let Some(v) = self.location {
+            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
+        }
+        if let Some(v) = self.subpat {
+            out.add_tuple("ident_pat_subpats", vec![trap::Arg::Label(id), v.into()]);
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct IfExpr {
    pub id: TrapId,
@@ -610,26 +630,6 @@ impl TrapEntry for IndexExpr {
    }
 }

-#[derive(Debug)]
-pub struct InlineAsmExpr {
-    pub id: TrapId,
-    pub location: Option<trap::Label>,
-    pub expr: trap::Label,
-}
-
-impl TrapEntry for InlineAsmExpr {
-    fn extract_id(&mut self) -> TrapId {
-        std::mem::replace(&mut self.id, TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("inline_asm_exprs", vec![trap::Arg::Label(id), self.expr.into()]);
-        if let Some(v) = self.location {
-            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct ItemStmt {
    pub id: TrapId,
@@ -675,7 +675,7 @@ pub struct LetStmt {
    pub id: TrapId,
    pub location: Option<trap::Label>,
    pub pat: trap::Label,
-    pub type_ref: Option<trap::Label>,
+    pub type_: Option<trap::Label>,
    pub initializer: Option<trap::Label>,
    pub else_: Option<trap::Label>,
 }
@@ -690,8 +690,8 @@ impl TrapEntry for LetStmt {
        if let Some(v) = self.location {
            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
        }
-        if let Some(v) = self.type_ref {
-            out.add_tuple("let_stmt_type_refs", vec![trap::Arg::Label(id), v.into()]);
+        if let Some(v) = self.type_ {
+            out.add_tuple("let_stmt_types", vec![trap::Arg::Label(id), v.into()]);
        }
        if let Some(v) = self.initializer {
            out.add_tuple("let_stmt_initializers", vec![trap::Arg::Label(id), v.into()]);
@@ -703,19 +703,18 @@ impl TrapEntry for LetStmt {
 }

 #[derive(Debug)]
-pub struct LitPat {
+pub struct Literal {
    pub id: TrapId,
    pub location: Option<trap::Label>,
-    pub expr: trap::Label,
 }

-impl TrapEntry for LitPat {
+impl TrapEntry for Literal {
    fn extract_id(&mut self) -> TrapId {
        std::mem::replace(&mut self.id, TrapId::Star)
    }

    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("lit_pats", vec![trap::Arg::Label(id), self.expr.into()]);
+        out.add_tuple("literals", vec![trap::Arg::Label(id)]);
        if let Some(v) = self.location {
            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
        }
@@ -723,18 +722,19 @@ impl TrapEntry for LitPat {
 }

 #[derive(Debug)]
-pub struct LiteralExpr {
+pub struct LiteralPat {
    pub id: TrapId,
    pub location: Option<trap::Label>,
+    pub expr: trap::Label,
 }

-impl TrapEntry for LiteralExpr {
+impl TrapEntry for LiteralPat {
    fn extract_id(&mut self) -> TrapId {
        std::mem::replace(&mut self.id, TrapId::Star)
    }

    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("literal_exprs", vec![trap::Arg::Label(id)]);
+        out.add_tuple("literal_pats", vec![trap::Arg::Label(id), self.expr.into()]);
        if let Some(v) = self.location {
            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
        }
@@ -966,6 +966,27 @@ impl TrapEntry for PathPat {
    }
 }

+#[derive(Debug)]
+pub struct PrefixExpr {
+    pub id: TrapId,
+    pub location: Option<trap::Label>,
+    pub expr: trap::Label,
+    pub op: String,
+}
+
+impl TrapEntry for PrefixExpr {
+    fn extract_id(&mut self) -> TrapId {
+        std::mem::replace(&mut self.id, TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
+        out.add_tuple("prefix_exprs", vec![trap::Arg::Label(id), self.expr.into(), self.op.into()]);
+        if let Some(v) = self.location {
+            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct RangeExpr {
    pub id: TrapId,
@@ -1025,7 +1046,7 @@ impl TrapEntry for RangePat {
 }

 #[derive(Debug)]
-pub struct RecordLitExpr {
+pub struct RecordExpr {
    pub id: TrapId,
    pub location: Option<trap::Label>,
    pub path: Option<trap::Label>,
@@ -1035,30 +1056,30 @@ pub struct RecordLitExpr {
    pub is_assignee_expr: bool,
 }

-impl TrapEntry for RecordLitExpr {
+impl TrapEntry for RecordExpr {
    fn extract_id(&mut self) -> TrapId {
        std::mem::replace(&mut self.id, TrapId::Star)
    }

    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("record_lit_exprs", vec![trap::Arg::Label(id)]);
+        out.add_tuple("record_exprs", vec![trap::Arg::Label(id)]);
        if let Some(v) = self.location {
            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
        }
        if let Some(v) = self.path {
-            out.add_tuple("record_lit_expr_paths", vec![trap::Arg::Label(id), v.into()]);
+            out.add_tuple("record_expr_paths", vec![trap::Arg::Label(id), v.into()]);
        }
        for (i, v) in self.fields.into_iter().enumerate() {
-            out.add_tuple("record_lit_expr_fields", vec![trap::Arg::Label(id), i.into(), v.into()]);
+            out.add_tuple("record_expr_fields", vec![trap::Arg::Label(id), i.into(), v.into()]);
        }
        if let Some(v) = self.spread {
-            out.add_tuple("record_lit_expr_spreads", vec![trap::Arg::Label(id), v.into()]);
+            out.add_tuple("record_expr_spreads", vec![trap::Arg::Label(id), v.into()]);
        }
        if self.has_ellipsis {
-            out.add_tuple("record_lit_expr_has_ellipsis", vec![trap::Arg::Label(id)]);
+            out.add_tuple("record_expr_has_ellipsis", vec![trap::Arg::Label(id)]);
        }
        if self.is_assignee_expr {
-            out.add_tuple("record_lit_expr_is_assignee_expr", vec![trap::Arg::Label(id)]);
+            out.add_tuple("record_expr_is_assignee_expr", vec![trap::Arg::Label(id)]);
        }
    }
 }
@@ -1285,27 +1306,6 @@ impl TrapEntry for TupleStructPat {
    }
 }

-#[derive(Debug)]
-pub struct UnaryOpExpr {
-    pub id: TrapId,
-    pub location: Option<trap::Label>,
-    pub expr: trap::Label,
-    pub op: String,
-}
-
-impl TrapEntry for UnaryOpExpr {
-    fn extract_id(&mut self) -> TrapId {
-        std::mem::replace(&mut self.id, TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("unary_op_exprs", vec![trap::Arg::Label(id), self.expr.into(), self.op.into()]);
-        if let Some(v) = self.location {
-            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct UnderscoreExpr {
    pub id: TrapId,
@@ -1345,18 +1345,18 @@ impl TrapEntry for UnimplementedDeclaration {
 }

 #[derive(Debug)]
-pub struct WildPat {
+pub struct WildcardPat {
    pub id: TrapId,
    pub location: Option<trap::Label>,
 }

-impl TrapEntry for WildPat {
+impl TrapEntry for WildcardPat {
    fn extract_id(&mut self) -> TrapId {
        std::mem::replace(&mut self.id, TrapId::Star)
    }

    fn emit(self, id: trap::Label, out: &mut trap::Writer) {
-        out.add_tuple("wild_pats", vec![trap::Arg::Label(id)]);
+        out.add_tuple("wildcard_pats", vec![trap::Arg::Label(id)]);
        if let Some(v) = self.location {
            out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
        }
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,4 +1,6 @@
 lib/codeql/rust/elements/ArrayExpr.qll 822b7dea414d3948f15ee89a014d9ab5ab857db59d8eba7ade8ceed3b453bba4 fb0fc738da8142e8226d99db5ccc1006458bf50f1a95699cbd3012d0917db196
+lib/codeql/rust/elements/AsmExpr.qll 825f9aad83cb4f40cf25ff2da0bb6bf4c7e2b469443f7a8902a994c89d134e38 24212a120cb55658a621085d4e1a3fa611ca9ba742784c772e2e1d353e73783d
+lib/codeql/rust/elements/AsmExprConstructor.qll 2b81ea1b0df1171f990e30f074cf8bbccfe7cfd775a746d48e09c60d5d5c8e04 e427132d2731a703ebe047a5e81559813ed4cd055aaf3a0f1221eeb76247ad6a
 lib/codeql/rust/elements/AstNode.qll 2069047c779514867c12d845dcdf889db6f27fa6a9e484966a3c28a77973b7d4 e214616c81418b0018c0d36896ac2ec7273634e3213bc8257d8b172f396c00ee
 lib/codeql/rust/elements/AsyncBlockExpr.qll 7cc9709af8c5f844fd6bf6d4cf49e245d19a0ab6d73ef69e84888a4a9b8e47ce 2f9ede385321df47d2e4ac1297d07be987ff53a576a8dded9a615ad83fba6de3
 lib/codeql/rust/elements/AsyncBlockExprConstructor.qll 2d7d22caca1984e850d723f9ddd581530734bf4c31c545ea598bc27144a32f1b bf2ff9edff95db8400017b7583d6881581c431755c70e0068a495787993010f9
@@ -6,10 +8,8 @@ lib/codeql/rust/elements/AwaitExpr.qll da0f5928cfee39223c48b74b1921d18c39cc4f8ce
 lib/codeql/rust/elements/AwaitExprConstructor.qll af0dfdf36b300d412a7b8668f68e6594fe3338216cdf1aa420c9a58608aa86f5 cfa115902ccf070e34ee451bc2f89295c97e8418501359a8cdc646d16c4cc7cd
 lib/codeql/rust/elements/BecomeExpr.qll cf7d219b639e8e93f6a44bb14be14740b17bdb789f7299863560b2b5d4bfc7f7 26511c65fbdbb9352b6628a813e3f00be8495f2a34abdfae5a5ece8dd59cb04f
 lib/codeql/rust/elements/BecomeExprConstructor.qll 0c206e657417066415850672a804a69e5fccc605c309bb8755737ae01e332f18 e70bd0c411ffc23c37b22a459455c95ff75a72fa2d179f751bff99866eeef2bc
-lib/codeql/rust/elements/BinaryOpExpr.qll 8bd02bff68a9a611ed82b2d380bbd8e541f9cfaef570cb33ab33ba9da7169172 2e51a9f16c4c91d2aef717ddb4c3080eab1a9c8720dbe44f83bf668668e4e772
-lib/codeql/rust/elements/BinaryOpExprConstructor.qll efa89c084def020961641772f4829fc54bf718817831d4752b9bf403ce0e61dd d7937326ba08410fc3ba37e44b76530804f492177ef5e62dd416094e1e2f9bd6
-lib/codeql/rust/elements/BindPat.qll 712176af2ff0eb8aa2bc97fdd792576fafd349b7e33d04347cb5b4c6392e8c81 d44ae771c75a090f83890ee2e1fcc4816d8fe685ba2981a9e7cfe28118b0ae4b
-lib/codeql/rust/elements/BindPatConstructor.qll 2bbcc296bcdcd945313d83294b90d327c51c9f1e96f92d37dd10bf0c32dfaf6a 612b4fc651f32129155727e866796edee8fff939614c6fd0b7baa1392930a38c
+lib/codeql/rust/elements/BinExpr.qll 201798bde3e0f8e2c6b40e1771c8de21c7a962da4c18f69773fb6fb7f59bba36 e8134215b75065bd8acb3d2b11a0c4129615e333a5dac48ab4b588f7463afc3f
+lib/codeql/rust/elements/BinExprConstructor.qll 29d27d66a269ef84a4d6f9ff4785d9aa44225a109886294670828f0e0fa56a35 4da4fec6432c73880eff119a4cc7dbef5816c433a7d25ab3e5818283a0e28944
 lib/codeql/rust/elements/BlockExpr.qll b699906fba2dee34699e110b8759419079a5ce3dc1fab207001c9c9b612dac5e 429016df600e3905bd235d0e707c50ecdbf12b3ceddedcbf48944ea76e60f915
 lib/codeql/rust/elements/BlockExprBase.qll 1b24ea5fd43dce0e240e1d7740a062228c19e8c704f6ce26503ddbd65c6f5282 d2e05a51d3840caf4de4cca6cdab9551f396df317c8ad1da661205aa822646cc
 lib/codeql/rust/elements/BlockExprConstructor.qll 7fc9214582f0e6e8b4db06f7c6ac3712dc260abc12ff65f3e93bec5f210b0098 13bc676b67ed14b326e4bdaaa43b497ce486dc2c3145a76a25fe960c82a6ba54
@@ -44,14 +44,14 @@ lib/codeql/rust/elements/ExprStmtConstructor.qll 28e37020abdfce5a8666b0c9a3147c3
 lib/codeql/rust/elements/FieldExpr.qll 54b2dac331f4de45c4520e318373805d41f63d45ca695ae618c8f42d30f38d5d 2f87397d3cfb07763e287b0bca83d625368ee2c6f29f8fff2de509d5696ed27b
 lib/codeql/rust/elements/FieldExprConstructor.qll 75bd0526fae157460750f3ea1e087c857cc703fca03d34f1f478b57ee8051590 1e5555910c643235e34b73f9844e894e51f357c3f7aba8165c47caa147336c53
 lib/codeql/rust/elements/FunctionConstructor.qll a9269b37182c0bf432f9b2b015691da5dbd64819b9bd25445af229d873014a91 69107a7503af14a51e091e6918094a4e9fc316a72de2e1514f001872ce0f2c0c
-lib/codeql/rust/elements/GenericArgs.qll 4cfd7696e2fd8117c2bad398222aa893222b15cf76255b9ac03ef6d47f8b653f 3012785c8601ca3942388b9a40fde58dd40365467a0c709a24259012c359b9b0
-lib/codeql/rust/elements/GenericArgsConstructor.qll 581b52a92fc3222bc4695ef403b37de513dfa820f0cf73a394a36a351de66bbb a61f06c2aa13ab5852c792faca80148aa8233168ff5b91e3ce9e8d458b62608e
+lib/codeql/rust/elements/GenericArgList.qll 3db540d2cc2ee748aae2d4ed7917644e78e0016649e8a8e0d96aab78f2893564 b6b826e9a5ab14448e1ae35d5a22029050c08a18f9ef68d4731c6641c7e0f6cb
+lib/codeql/rust/elements/GenericArgListConstructor.qll 68e8739557bb470c04ae12f6b39d34c6fa4966bfdad1768b9e4f1a596447cd72 e0fc7e51fea925b7f21e771eca7e1bb2d506d6992c80ecd7902c9656610e545c
+lib/codeql/rust/elements/IdentPat.qll a38187662d8e7db4a448f10aede36a3bfbebae3ff352758e28c951245f1c656f 3f8c5ffb92d5c2e79c98a6b19084d78215156c5fb3d86ccfccc8c5fdf3a5fffe
+lib/codeql/rust/elements/IdentPatConstructor.qll 3144353f70712a224b5e7af6c5a2cd3452d4c2e164c38092ecb5f6c668401a92 26732573959eec1690afbc1d99ddc76d1fe4936244e0108e7d7c84f69136539f
 lib/codeql/rust/elements/IfExpr.qll 87d29f7f6eec05e03d3e929e32b526787f41d5320141bfe96028973e15ef225d 42789266b2c54b222c1d980f85e3150c80397668e61c9952df6905f1bf0fc4b0
 lib/codeql/rust/elements/IfExprConstructor.qll 961ac42fe811db7c56c9d85e98724a87571e8543265c0424a7b61f26ef41b369 43d9412a22908a7e5c38f1f5e8f88162367407b71037f469dfb7d8dfdc3a063f
 lib/codeql/rust/elements/IndexExpr.qll 924fe6732ffefca376d099255e2eb6682cabd6cb4267dc997fcf85aa5478a3a6 09e65b09cfdb928d134d3aad17acc07602a0bcbca098d775028bcb7624f16b11
 lib/codeql/rust/elements/IndexExprConstructor.qll 37e70c773123d775b6281514a2727e133e02fa87e774076f857a676697a1f2ba da2ed2819a13ab7c526b74c1c375ab2fce63ed17f61d5b29e4212343d6b77d06
-lib/codeql/rust/elements/InlineAsmExpr.qll e462d3d71b25124216acfa3f037b675c57bbce1ae98513fe52330a05152463a7 8789d586fe30368b037ff16835a9b36c8da8a1efac1bd7cfd3e048ef115b6cf0
-lib/codeql/rust/elements/InlineAsmExprConstructor.qll 5a3eb5162805366dcc2aea00714c1a0880c31b614b73b69f1638ff4f088cdb11 89c54b68b0246fe5d86f119c1892149746d7fe22d6ef8b625c9ab64398d19d26
 lib/codeql/rust/elements/ItemStmt.qll 7482437f4acc6a213a65cd1615be2f909cc4bfa354894df665c8f5e17622d325 aab0311fe7a189bf8221f51c3f46fccd785887d53e664b230abd94f5a89dfd44
 lib/codeql/rust/elements/ItemStmtConstructor.qll cd27051f73ab2897b1f7a725313f97d36507fc9f5e0dd7b2ad8bd1caaf8c42ad 67596c97386fbe6cb9e5e6abc45b674158f411d927297345cb25359587380bcd
 lib/codeql/rust/elements/Label.qll bcd453a21ecba694ea3e42316f0c2b6a213d885bf2cb5ad80fb14d64a1d4952f dbde62a6567c79b137c78210bf04609b2c259ada9a8bf8c1e35e44438c61b983
@@ -60,10 +60,10 @@ lib/codeql/rust/elements/LetExpr.qll 49a9ba97471d04d52bee73f9b5651bec09fae40c577
 lib/codeql/rust/elements/LetExprConstructor.qll 8904b25d70fd0e6f3db74d2e09bb3e3fee407282ee45030fdaeac31b6111db70 36dcc877f6c1810228d593d914cffa7b04ecf0afe13c4c122aca72f33d03f566
 lib/codeql/rust/elements/LetStmt.qll 542dacce4a4991f0250b45a6c3b28829117e6e5692320494819244a155d05e8d b3e50baeb3534a4352d6bf898ace88e250d84aa05ba0c0debdae5c18c446f3c7
 lib/codeql/rust/elements/LetStmtConstructor.qll 5882f0e4379d07e8281a955c9eed7dd907b610750887de3dd6451cd1c8d104d4 68b0890d8a493dcca74190904b00f05b0e58aacfe5a2aa63e5ead1ba366d3c38
-lib/codeql/rust/elements/LitPat.qll 1a95fc2a1dc6e871f861c984433f341b0e8a1b1c38823fe05b0f5a4aad59f007 693317895b39b9ce0791e3b2cdf46f36fc5f4429f4340658e913973bfb6e9964
-lib/codeql/rust/elements/LitPatConstructor.qll 1a1c5f711b04bfc9b8b9a197564cc8acfeeaff1a9c8b30d57657747d84138fce 19cfa7386fd1f4ad8ba1ffe8b14bc547b9884dc98e731b6935afd11ceac6b5fe
-lib/codeql/rust/elements/LiteralExpr.qll 031edbbd52d2107a3a7149a4dde306f5fcce9a32b7f4c5f7398b013c06ef37fe 7c18930dc7514f5fbe0a4248242430ee06f403b4e301c4e594355fc5b2fc8941
-lib/codeql/rust/elements/LiteralExprConstructor.qll 1a6aa25d6700ab9c85bd7b721e4818064a3a092386589ecdc2018b8b8c2464dc 6d6b50e2dabfa671110454d64f0903336563ee4be1dc6751071a801ac2fcb8e8
+lib/codeql/rust/elements/Literal.qll 5088223cfb4625a191c86f7c45d6b0c3b689f165f84d213e666f25828847b293 c76d8f97ed23b1c8f19d290d5cf367cf6e7820f1c7f7fd3dd6924fcdcd94ad2d
+lib/codeql/rust/elements/LiteralConstructor.qll 6a80cc2175b6f7ceeedab2c06ca7f980ccbf64f6a7dda8c779fc92cecf91f7bc 177eee9c8214f2a776df18fc02754a6685f116aefe00d1444643eea954436739
+lib/codeql/rust/elements/LiteralPat.qll 1971f70ba0b872de28e1a168ac63d35afc123c5a710efe83b78e88cf949ff20a 1d00573dcffe4d4cfd444baafed38ec693035057d6b825e76e47d436fd08d02a
+lib/codeql/rust/elements/LiteralPatConstructor.qll abe137b2b8ec9dd9450fc77d2d826fe891bbb0af23b0c26ff5e2d1751988f747 e1642805588737ed98eebec1d16cb0fb9fd081db203ec725db85b02c4837bdcb
 lib/codeql/rust/elements/LoopExpr.qll a32330e9f6c5420e7fbd4a61f53dde892c1acadabef074b7e9aa3beae39617eb 97061b3dd86af3ef271587aa337d10f2a7094cb69d7e339baf13e5a7817e1389
 lib/codeql/rust/elements/LoopExprConstructor.qll 635348fe22fb47c7e59bed02a8ed6420be5a9ce92a7d9bf4475465ee170c917b 2bcfe70247c55659b3a3e09562da52fc645cc3166748f268c5a38b35fca24233
 lib/codeql/rust/elements/MatchArm.qll 2508d03a0a8f8e29483855affd08eca118ed756a18a60fc7ae6a9e5d63fae2d7 b88a33eaefe08131f7c8e80ca056c237aad9ef7c21deb2bf35a2f5ecfd320f55
@@ -89,18 +89,20 @@ lib/codeql/rust/elements/PathExpr.qll 861b1d9e6246588fcb0b6d8560c7807a4209941a8c
 lib/codeql/rust/elements/PathExprConstructor.qll 9db3d3ad160d897b65b8b8a62f3243f7ff80d8e2d27875b3cd2c2b046fb0f9b6 26c2ba19a04fba61af8aa0cd72602f7b02bf0e1b693ac9cd14c7ff6066412f75
 lib/codeql/rust/elements/PathPat.qll 748a43d1c25c4fd20eaf78f381e4680207557bb696a28d74a9eaa1887bc966c1 186c947b0bbed3111c9bdc564c3ce39432c1a3bbdbb15ebb503629625ffe1dea
 lib/codeql/rust/elements/PathPatConstructor.qll 476a38723c63bbfa2565946725c90f1224ac2c5283fde79bf14dcefce6f500ca e9e9b000cac44851772bd9ca519edc89e8518e89a0930df21af14a69f5b0e864
+lib/codeql/rust/elements/PrefixExpr.qll b00c0033177df5668f951689e3b12b039fd53c8618492b0e79a759712f3d3c81 1757e788a5a33b6ac4622752c1e8d7c2a48e9893116355b350b04836fc7d1e8d
+lib/codeql/rust/elements/PrefixExprConstructor.qll 511dbd31bbbd6b31cfba4a8f76e05a9fe3d1c996d9c6ac77991059f26214775f f6d1b1a96e148debb6cf03908c07cf2f42e2891ef0c54f1705a477a4ffeaf34c
 lib/codeql/rust/elements/RangeExpr.qll 42bf1320c3060b6d225e7ece9bef54f3d823704a6aedea6d8af594a0fa676134 03a84ac76225e2a6172f6240af21478ad3f978b03a1b9e3fceba39fd0bcacba1
 lib/codeql/rust/elements/RangeExprConstructor.qll a04153bf88dd71c3f516418bdb7377ded9db21c07f7ee6dd245ed8b44719d8f3 2d578f8dbc49da98694676d6a59bb9d58c6d2a200ffc893ffa90dca77878e38a
 lib/codeql/rust/elements/RangePat.qll 7df30b22d972c48151c9a0428245b9d33cbe3ed61a8767ef3cf1a82dcb949a85 33fe10d12a8d9abd4128fb6af4a61badf3204c538a1bb583f20a30df4ee42b42
 lib/codeql/rust/elements/RangePatConstructor.qll c391431118ed6ce16f7b7126c5d43e61f07b98fab7b8bc48e9dfe22f7e21ed19 bbafe1c9595b0b004f7b27999a14df27d0710d5b058e7ab14dddd2fae058fc31
-lib/codeql/rust/elements/RecordFieldPat.qll 3bbdde1d7fcaaddeea674a7812216d3e25bc9cd7252ab190bfaf0d43f53dfc60 a1eac9ca2819871d361e751f3a180b5f785441310b182340637252975f2b631a
-lib/codeql/rust/elements/RecordFieldPatConstructor.qll 36859753aa70086c540a1700495fe6c414521553877bfdd56800f586eb577743 1b31233a5e6da0bf88aaf40c52fa08cfbca5b44088cd3f91957ce8c96f4aeaea
-lib/codeql/rust/elements/RecordLitExpr.qll 5dd804785e2bef9decee1aa1b4512dad799ba6b8e70c3fbe65a9a7bca029ed87 875a6b37072010496974a36b535e8ac656928b504b9b9488b31f81108a25102e
-lib/codeql/rust/elements/RecordLitExprConstructor.qll 7b676a8e0fd9ba5a932988e613fe3dda8b6b0430feed8791ef5585fd9cd81767 f7811928dd8269138d75f0a6dd1c60f70d18806227bd2caaa5cd4cc1341e9286
-lib/codeql/rust/elements/RecordLitField.qll 09cabffa00afa3a1e7798b735828b613b2c6bbc03c27c1b3229c0b4ee43ba3be b1ec3a53f7370b2702d042b78d829bffd35b738365e93b289f0f30313ed9222a
-lib/codeql/rust/elements/RecordLitFieldConstructor.qll 0f83c9dc00937d90ee0d64d157458145078f5f3c87c9c0484600fdcc830ab207 e2852d5bc4f0174d94b90a2ee34fae1e6c4b24d5d8ccb58a51c520b12adf8512
+lib/codeql/rust/elements/RecordExpr.qll 20d6b98d1d16bf20cfdccb75b77f012b1450349a756eefe16da56916188dbdf6 61a724e9cc82bd1617f2824d4b778b464284172ac5bc21c8f7d9730c5aeb82cf
+lib/codeql/rust/elements/RecordExprConstructor.qll e27ab2bcb3af858fa8112a28603da8ba2357347339ca31b6bfc3ae35694a7db9 b947ab8999924cf578d2fa26902285008d4994d3b740ca956fb3e32b4bdede52
+lib/codeql/rust/elements/RecordExprField.qll 4eed8b07e512ee858c6407d6602dab6e45a4bedd62a526a1be979e3bf57aec45 af181dd655abead2dfc4c9123ab2bd3755a73394ec1312a4c145bef8c22aba14
+lib/codeql/rust/elements/RecordExprFieldConstructor.qll 17bf9cf80046b2c49678e221177e2f6b520ebb124d39308ddb1f2f0b93a3d818 67c91c4e7b8923888901c785b40cb90561e81a870d74e0760a2eeabc5e5a7d4e
 lib/codeql/rust/elements/RecordPat.qll fb02784f6f7b1e1cfa5e2f493dd3e9b084fba5755d237f80296bfab734b4744a 619b6fb3b14d154b3bb17d2937b01d0c4b2c56544bccb8400dfc3c2b848cee18
 lib/codeql/rust/elements/RecordPatConstructor.qll 93c794efa5050b86c458470224de7f3206c1a004b46ef374780f080a8e9a4ce0 157800f342de96095e118dbcfa20f8e65cc79ccae712e8e37bff1ba92a227fda
+lib/codeql/rust/elements/RecordPatField.qll 0ef9ff7a71d938a39d2cc220ba395426198c0de790f8f9da23090e95b65bd0a8 69e58fad68784ed49909b32948aec754828841067c7ec08338df1ec6ec0b5d68
+lib/codeql/rust/elements/RecordPatFieldConstructor.qll c105362a0d1acdd69bbb3b0c1f0ae2e20f677020d15d02aa9e7416803ddb3a21 5cdd18cb9c26197eca67e162ac080b7f17dbb46061419bad07c6f6d12508f642
 lib/codeql/rust/elements/RefExpr.qll 4c3176d24c52d61dc220d0ebf0c277126975a7e4189094c5f36e0d386bbd95e3 dd143ae809b9c3cd1ca20e8ccf2ed2fa79f0b75d3ce3d92de5e88dad68bf7fed
 lib/codeql/rust/elements/RefExprConstructor.qll 4a2b9dd4ec2638a5ccfca268ba377980aab3179b27177e34e44e0e9dc6653b36 752f6f298369b8c0f59d49ca9e729c20aceb3559df68be416c7bbf65f578489d
 lib/codeql/rust/elements/RefPat.qll a273a13acefaaf366a6c9092f5a60e37bf8467e6d245384fad97a79f682cca9a 19199e218fb18920c5338e748106c53d13dd72b6b49681768b3781c93e277b46
@@ -118,10 +120,8 @@ lib/codeql/rust/elements/TuplePat.qll d9161426edabc199d206a3a1c2994bbda9430d7418
 lib/codeql/rust/elements/TuplePatConstructor.qll 505c4f440b47da576acd7e3fc69d6b49e8287f981a21e79919ded374200f2578 b295526303bcae982ddd8c6b544288c0b8b8d62984d6986319e7f17baeb7a19b
 lib/codeql/rust/elements/TupleStructPat.qll ed443440791cf0868183c5e5304a855058ce78c1b3735507b5c35f269604022b f02c9481ea471b198eec0909d01bd3db03830bd98f10bcc3a2ca4f37b1466b79
 lib/codeql/rust/elements/TupleStructPatConstructor.qll 15a15362572ac2dc98ed3257f195f20bb8dfe34a1fe203cf2a1a193ce16c406f 9e590b50cf865f6bc573b6fc17acea073f0d9389be241b01e820d9f3f8f14acb
-lib/codeql/rust/elements/TypeRef.qll 13824c88938542cc554bc9ead335136a4eb115ec07ced03e140c9a88f49afdb6 4d265a4fa37a9df406d4bbbad03a69bcb3b5edd3152482fdb90676466283194e
-lib/codeql/rust/elements/TypeRefConstructor.qll f8b2e5ef15517890a8b2d56643f471ae64cc74c420187049e33b182417e72e4f 683611e732b842756e301a77625b385bca0c4969971020c9e11220a1aa665a29
-lib/codeql/rust/elements/UnaryOpExpr.qll 9948297ab5799279738499586e4fd4457e7770db8f33461d0d1c3641498a268e c637101ddfd1770ed0e47a452b2fc4d210ea6f61f36ea968c23a8cd3032c4884
-lib/codeql/rust/elements/UnaryOpExprConstructor.qll 43db7afbd3535b7edc801d99d772233a734f4ed31eeee2ca74e7ab26cae33e87 7345f8d4cb958ee2fa83d3634285f12829bdd1cbac2697236d6fae062313ab6d
+lib/codeql/rust/elements/Type.qll eac066a4d80006795d420d7000c69389eebe8fe8bfeaaac384a03c1cd829eb51 03549e3b3bbcc89cd8b9f81d30e8b567c846660824aa906fad846d1aa717659a
+lib/codeql/rust/elements/TypeConstructor.qll 10d8f9157d864e1035a1773d8a8355e3b8671b1605377b7a8427ea8625fbba6c 02a2cd28ef2379de6fb70f5e68bbb5ceaf815defea15ed990cec46bb70efdadf
 lib/codeql/rust/elements/UnderscoreExpr.qll bf4c0bf76fa15b041f7ecbd492a499088bef2024b49dbdfa57232e84e72c3067 462380bac5f772c1986146d32b70deabc9f03581675f6e79f7b7f747acfb0bd5
 lib/codeql/rust/elements/UnderscoreExprConstructor.qll ea9f93fa6529ec4e5bf5c4a98959b2e013e83fce4a74ebfc476b10bce2b331b2 bc36b62fd4fec6fb388d82e2af2aafe0099138d54b7672be81e84fc511fdcc8f
 lib/codeql/rust/elements/Unimplemented.qll 60387a9def0ea3cb9534311ace088106800af0acb89883c5bc9b26d8d8d61718 9d869f83e73915bbeb5af27ea30b69f20c344cd7d7f253cb7dab74de20baa0a6
@@ -129,28 +129,28 @@ lib/codeql/rust/elements/UnimplementedDeclaration.qll 4d55b4530ea3dfc38fb41dbfd3
 lib/codeql/rust/elements/UnimplementedDeclarationConstructor.qll 44f4590db81e7504de0ede43eb2a33a54baa0738732e03a90721187a1cd303f3 11f27d8a9836b78d9ffac79efa3441fbfcb1dfdc1eb028d2016a1769b8a82ad5
 lib/codeql/rust/elements/UnsafeBlockExpr.qll ea7fc05c8f25b99205c098590329465ff9db9293b7d72cc41054b6c4e28ecb00 d617e6873b62ca2871ed87ca2435904da51cbdba42d46a2d160440b11f14dbbb
 lib/codeql/rust/elements/UnsafeBlockExprConstructor.qll a089d89cb8f9542b3ee94c8eb7ca9ce0ced08c954802b26826f6aff12f8705dd d3919a40e13d97c48b19df647851f120b667300864d3a2178b1b01236c2dcbd4
-lib/codeql/rust/elements/WildPat.qll dda006b9e762a6f655842c2888bdd33c188c391adac2f2e79437ab1d4969388c 99cbb5c5d64f0bf7a20ce6f0d85bcaa065503505d42dcfd342fbce5a4704ac4e
-lib/codeql/rust/elements/WildPatConstructor.qll 538cde83119510e0b3fc9728127cbf980d17f7f4a9371b4572de26329ab08341 66b96aee3862d5c314a2fbcc6930258f755189c4359394b432e8edb13a9d0eaf
+lib/codeql/rust/elements/WildcardPat.qll 1c67ed3bf441d04a57f5d82a78856008fff694e534eacb8a96c41fa7b43b12a4 e98d72b2d9aa50cfb805dfc917d8ac454af60fde11e8139f001ebf67e6987e9a
+lib/codeql/rust/elements/WildcardPatConstructor.qll f974e89eedde9d8a2a59562d0f5c87f6b00c61a428b7df734804fc87a6cf5090 36f5e961c88b0be4db1a907607dbcc8e0ff2f8e49c9eda0ead88a4da8af5b177
 lib/codeql/rust/elements/YeetExpr.qll 95a15d0ae79b9cad126700c07d5cb7e4e9699e2e5d11a926ce452588501731bb 848736c361d420945fbf670d6c126d258d095f7f8509ac1cbc949f5ba280f851
 lib/codeql/rust/elements/YeetExprConstructor.qll f1871c6e0c966c52806e370dbe2956585bbfa1dcf0bd7ebfdb2bd39b7cfd0d7b a2333e80a325a921a66c34151401da12c250951952ccb0c81e5102dc62299503
 lib/codeql/rust/elements/YieldExpr.qll 72682ae19d37abd6ec26569ae8f575979ebba1e0d373898211a9af4fad4979a1 ef0193011ee5f94cebbac5c007d652568f560685a213bf8be96cd0c0983a3880
 lib/codeql/rust/elements/YieldExprConstructor.qll ff46ba17cc24abfcb0e310c7458d0539b704e7a771ad00853bd3a1844e4e6f82 1c13662ef01c88f1cf057d099eb46524036133e51a0e36ddf947f727ac6046bb
-lib/codeql/rust/elements.qll 515e43d4d74ee62b20e5f9a56d28d405717586a8adcbab1c3ceac1a090f68a0f 515e43d4d74ee62b20e5f9a56d28d405717586a8adcbab1c3ceac1a090f68a0f
+lib/codeql/rust/elements.qll 6bccd637e50ab9e7dd59ac18553d5c4a523e7883bf5261fd388715332cc7e500 6bccd637e50ab9e7dd59ac18553d5c4a523e7883bf5261fd388715332cc7e500
 lib/codeql/rust/generated/ArrayExpr.qll 3fd7465da22e1eb810ae28ffab7b14e9ccceaab0082aa665f14b73d4221128b8 6e9edb5846656aad90283406a496aaae485d38854075a4443817b5098b72b427
+lib/codeql/rust/generated/AsmExpr.qll 66f1a4bfb4d32d99b4dab1918a1aac75e0903c499d65a18105e3c837c1aa314d cd5c8ed300b5f5d19e404cd2e5f9dcbcee1081c5538f1840359eb491eb6ecaa2
 lib/codeql/rust/generated/AstNode.qll 0598fac7859906f4103124270dfb2fbdb838387b1c45000bf50a4b62c797ec41 f47c84878c7c9676109e358073bddab92a1dbeb4d977d236ecc1eae44d81c894
 lib/codeql/rust/generated/AsyncBlockExpr.qll 4038dd9d888f98e8848de4ab858804bbb6dd835a32e925a9530f350820edaf04 4038dd9d888f98e8848de4ab858804bbb6dd835a32e925a9530f350820edaf04
 lib/codeql/rust/generated/AwaitExpr.qll 5a6d94ba4083e00dd971f41be7f32693812cdd7f8efb9dc7ef0fc18296ed560c 7af5433b8e945932a453eededcdc931a62d85d1505c0b4e417291c694ac6cc5b
 lib/codeql/rust/generated/BecomeExpr.qll 62daf23501554f0b786adbee8e1d430323c6dac79afb8fdbc28d19dc10bdb3bc b17eac6c775fc38bca90a65caffe1294678aeab92d456fb9b9f555e1ac59a0b7
-lib/codeql/rust/generated/BinaryOpExpr.qll 54902ee8922ebecc3e6c03d5cf31f90a8c305601889b93177f413142c61d451f 56a56b576ac8ec7aed8778b411f7e670b40789fb63a2234d7144b21b5a9dff61
-lib/codeql/rust/generated/BindPat.qll 8ad576c6dd5d16103bcda7f7e08c19d088190b27b43e61223010bf79eaeaafb1 98ef91d831f66d3df84add160df863adefe4b3ae54c8f8d06091af4392c1011b
+lib/codeql/rust/generated/BinExpr.qll 1e50692aa42f5b57b4644a368941b29f5941c7cd753be79be0f79340cda583eb 99ef64567805b97d83d31d55df728be74dab07af8252b9edad74b87bdd5019cf
 lib/codeql/rust/generated/BlockExpr.qll a04d98a1b846a78d5df7c9340348bdc0d4e27f1aebf81ecc389f90010aeb9f39 caa43e2ab10a401af6813218318a970efd60eba23bfaca3210954be277cddaa1
 lib/codeql/rust/generated/BlockExprBase.qll f651ce968170b6e05e555924f8004d55b85ff0ae59bce4fea0804691cef0cf66 6ece8056e83d047fc27cdf1110fac166c0d1ba0e26a8d4a7a7cffc05bd6b3b42
 lib/codeql/rust/generated/BoxExpr.qll 939fc9a934c5787e3f3bf9aef8694abe65caeeaeca57079047f6177301e39841 a9563f56abe4fc816f9768735624038e60ff5a075e67c17970a054ffd4d23a12
 lib/codeql/rust/generated/BoxPat.qll 8a856d3bc45313bb67b3411fe500c4fa508f7d80abcacb8bbe0a497624282b0a 2e0c7e16f437792c3de5d66dee5562dd7955a22a3e835d723915cc296d3264ea
 lib/codeql/rust/generated/BreakExpr.qll d1cc6452044b4f0351380adc9e46dc52279746d0cfa37baefce8e89494b385f1 c129e16ad176f40bbda2fb1e6af800a5bd240f3e0dca6e2fbc23b75e105ca8b9
 lib/codeql/rust/generated/CallExpr.qll 44cc428b1950e0d560a4e2c18136a956dbc3f85c575317cbf10a0cb5b2dded97 1a5d8dfd704b289774d7190ee331858b39563dcbb2c52940b02df4c5c2208637
-lib/codeql/rust/generated/CastExpr.qll 0264db34cb111644de4d37569791a2c27665f3a7373c26adfdc1d68ab0a6fcc6 3a757ea06c6e0c715d88bf1eeb579998a0ecc5560fcf3b4066bbd86803ffa100
-lib/codeql/rust/generated/ClosureExpr.qll 43d9ff09c156f1ce000c77bcf5ecc02c8fb569c0ca7f042a1aae9d311e18b13e 07e1461269e1f07144468ef7b64b927f29053fa6de71afef334732c33a797f33
+lib/codeql/rust/generated/CastExpr.qll bda5ec9c2639325ac6ffc65ef44bad0ce7769a0618925d93e59101c3a7b6b804 a40eba5690369b55f373e2c2d724e19791f7721c50365fa6ce1ac93b387a1ea1
+lib/codeql/rust/generated/ClosureExpr.qll 326e2de4da089a078861f5b67fe1c4f4afb7dc295e983fb13c08ffce1d88e577 7e39547d367be795891668e5fcb8a694689beaee3eae63293af1d7c9c6961875
 lib/codeql/rust/generated/ConstBlockPat.qll 05141706ad963e1d9c41b004c73c9569fd0ba2f353da8c19629a153bfb17b769 786fa7db63ea7a8106162fd05e01b52c8338d22b9502d3638880bc6f6d678344
 lib/codeql/rust/generated/ConstExpr.qll 7bd3d75822259d2ac61bf3bab6a233948617fa09a7a3d48991b643f0c842925d 06785e5b723006a8c51cafda5b8ce3901e0ddd3aeafc0d3c80e61b9389830e85
 lib/codeql/rust/generated/ContinueExpr.qll 452fc59b28ae46d00c6b42dc4b51bd5e65bc92859e769626a6f5b29ff2ec795d 4d7042814fb8f214bf982ad9771ca1a19bbb2a966ec20771478d50927cf1993f
@@ -164,71 +164,70 @@ lib/codeql/rust/generated/ExprStmt.qll 40fd3659761005fe0de2a09e58d35b3b28203f8f3
 lib/codeql/rust/generated/FieldExpr.qll 5050cabcc1109f0c404a64a80cf8e595088b1dfd9c24364281176400436922ef c7562bc91fd7c3f7305100d146ebc84378e73aa76fd1b36c06e69070105c0401
 lib/codeql/rust/generated/File.qll 2eff5c882d044d2e360fe6382fb55e5a45f6ccb9df323cfa1fae41eae9d2a47f 87e7a906b3a1b4de056952e288ddd7f69fa7cb1bd9dc7dd3972868a9002ac1e4
 lib/codeql/rust/generated/Function.qll 133693679cd69f0c011d6aa779b067924e8d58ea15bc3f6b749cc3aa5d5e962d 5a18e3be5c7c681cebec762b2c2d3b1cb08c5fcc11ef422bf65c9b15fc82c893
-lib/codeql/rust/generated/GenericArgs.qll cfde67ab0c0fbc7a889f62cbf725f2a6ef375d2a2dc806976eb9ca343ab37b3a cfde67ab0c0fbc7a889f62cbf725f2a6ef375d2a2dc806976eb9ca343ab37b3a
+lib/codeql/rust/generated/GenericArgList.qll abc549b0a763d2f5a162794676ab8f9a2fef8a02c77dbd14467dbafccf261c29 abc549b0a763d2f5a162794676ab8f9a2fef8a02c77dbd14467dbafccf261c29
+lib/codeql/rust/generated/IdentPat.qll 981fac200aecc4fc956c7fbd68f2516b5bd66be241ddefce21863ecf582bb283 8f371c7e08013fdd641d090c4a07b51b28e64cfe7114ab910ba4e151e5894e7b
 lib/codeql/rust/generated/IfExpr.qll 3b68ac5d7741f566081dd8ad028f762c849d02e4f1532267a7660e24335bf08f bcc6b52c950afbe4654ccdbc10d578ca9e134597cc2653daa1832fcb2bef2ab6
 lib/codeql/rust/generated/IndexExpr.qll a8263fb60cb625712b3ca875076994d9a28796482a9fc8fd524610d3107f20d2 a837f66ef6d70dd9ca04ef39d4fff5077e03ffaaf6efaf93e9f6b38eae37b454
-lib/codeql/rust/generated/InlineAsmExpr.qll 0fbc121595d55df71a9190200ee8d7244851c517181d907d07236a8c338f1ebe b41cad499ebcc6aae4326ac5ae596210997fde99b6107feee35d6c9f764f0f5a
 lib/codeql/rust/generated/ItemStmt.qll 7ac07a294031523ae83b1600a2327bab26c7ebda5c41f040485f9b978a50e159 7ac07a294031523ae83b1600a2327bab26c7ebda5c41f040485f9b978a50e159
 lib/codeql/rust/generated/Label.qll 25121c47ad829d209bbd6b4388a8878b9ded1f25e5b9c0f992e88427b3eaecae 216e68ad49218a21466597afe2a6aec20982715642aca726235cb4075cbc1cb5
 lib/codeql/rust/generated/LetExpr.qll 377099647451717af698677ca7119436982354d4e038a2097bffe8f34ac5686e 6bd51c497bcf2a684c1e6a2515e67228b0146b47a65e8d922cab54faf48b0d73
-lib/codeql/rust/generated/LetStmt.qll 39b49089d68052147935f226bea75a49fdddb42ff1bb2e700ee7b698db5ffe92 1078a1b9e20ae83a44dc0c12617ed53d79896d5cbe353a900accd78ba46dc960
-lib/codeql/rust/generated/LitPat.qll 5009d9fc8d11a0fcbac379602635e6396f95194f69eec3285a4745f662c23d0a 128f5b9a394f79581ece1796f68288da827b100d5f742e2d3873860b441bdea3
-lib/codeql/rust/generated/LiteralExpr.qll 70684629cd017f32c220993f57ee4ebea0b9f6267fb61200e97a14a026a8b0e1 70684629cd017f32c220993f57ee4ebea0b9f6267fb61200e97a14a026a8b0e1
+lib/codeql/rust/generated/LetStmt.qll 5d347ca3dbc1b6801de1b339a7694cf6fb4e4b30731356321ccab865d5ab6599 506c4a9745d0e014c600d23a2eb7862a069902b1ebe79dc5bd346147e3a08bdb
+lib/codeql/rust/generated/Literal.qll 66f362fb7e464f1d1350ce13465b029ae14673c84dd8ba7db1bc66083c3da4e7 66f362fb7e464f1d1350ce13465b029ae14673c84dd8ba7db1bc66083c3da4e7
+lib/codeql/rust/generated/LiteralPat.qll 6cb250e374f6c3d2c86aaea6ad7baeaa40ee438b42ac6987d823edb91b757d4c f8cf9ef6bb6cd39d65c6eb905f11f79c65daf3d493e1240c0781be29c3fe9202
 lib/codeql/rust/generated/Locatable.qll 9e9685bba50ad2220701f3465e63af9331f7f9dc548ad906ff954fc2ce0a4400 78c89b2cc78a357d682ab65310dd474603071f07c1eaaab07711714ce17549f2
 lib/codeql/rust/generated/Location.qll bce4c72988ec6fedd1439c60a37c45aa6147c962904709ef9f12206937174be4 d57000571771a2d997c50d9a43ef1c2f075960f847effa0e80ea91fd4c6b4d6c
 lib/codeql/rust/generated/LoopExpr.qll ddc646e715dced161b60638ac36a7671b45ddd6245a6876d647916d41495faf1 864be7033c093a8513be05691f772f19f99b606abe510f810af5f004596c0c7c
 lib/codeql/rust/generated/MatchArm.qll c82a871b33633dc5908d6abc665048b0bc3d761f134b8ceca51338c4a84a55c3 90faaed01f5e7c3ff6b9114b275c80418737c48b64082763e83cb63499fefa6a
 lib/codeql/rust/generated/MatchExpr.qll cf48ca2000a1cf2b2fa05b42403bba9be94aac23a88bc88e1b97e86982ff4fe9 244960785828aa62c4c3d17251ef5a3b7dd3ce3e10fd99a364f98f760ca84e77
-lib/codeql/rust/generated/MethodCallExpr.qll 83288ef71bb5f5ba9aadc3977ece9144b3eb58756270b9f76eaf3323153797b6 7fd96a56bb1fc0caa60b52d55a0cc14cc87bd3bd057a970993485375f9e3198a
+lib/codeql/rust/generated/MethodCallExpr.qll 187d28d3869f5b44cca8420948266e8370ca1e3e389dc3317dc24364c8d53088 7a4744cce29b53ca04b6b2eaf4fd146b9a64e3f53151e5c6cd1085fc35d50823
 lib/codeql/rust/generated/MissingExpr.qll 34cb27c927a62cc06b0fe26a085e2658abd5019e549c3e01b8273d99e9a9616f 34bf4cfbf3659b600b4aac121f7c2d6da0b00b61c3002f8fb1d554c11968c748
 lib/codeql/rust/generated/MissingPat.qll 9fa2685c9f8b285c6b2f470a2c482b3bd1f071707192bc963937cbb1092d6a18 9fa2685c9f8b285c6b2f470a2c482b3bd1f071707192bc963937cbb1092d6a18
 lib/codeql/rust/generated/Module.qll c6007444c796654fb48fbe4a4596580f08feec2aac13932043062a170dd73f0b 0560c738dbee3937baf0f2ab661c8e4dacd69eb886635241b1ff90f2c0f4bd67
-lib/codeql/rust/generated/OffsetOfExpr.qll 03afe5637df806f4649fb2c67fdc4f048a2faab47f00e8320f85025d4a2fa933 4e5c0c98b0397f1388ac0c27ea415f594ebd591e980dd70590ed043856beb156
+lib/codeql/rust/generated/OffsetOfExpr.qll 5f2c1d2b5d63d2a86c02c8a20fede528403f8dd267f3026ddc420e128f53c73c d4a7eb9e533a943913aa3bdc6f57d89023a0a2075681b6aaa53d5c4dd7ad764b
 lib/codeql/rust/generated/OrPat.qll a9a606b001c9b3c6f5cb3d65a593cce043f49b1e8a237310c058f5293eec46a8 4b6ab0d2192c93c64a5f98b6083e91ac03fd040bead24831a1a88d274847c79d
-lib/codeql/rust/generated/ParentChild.qll 68f8595b5d6136e7b29dfa7d5f4a6e77ad4f7feea9c40a0408e41d438a0a9159 53246623aab7cfd38e8c094dfb09c2ddd3adcca52f568814f672539a4d35b064
+lib/codeql/rust/generated/ParentChild.qll ffe3bb352e1530ba64a394a70541d86dbedebd004a201b94c1b15d368b127319 1c8f74ba0bebb390ee774bfe295c9b25b466e64fd6ba4a1a4f1655885ecebce6
 lib/codeql/rust/generated/Pat.qll b035e7866ea500232421ef9f79e7e60b90b9c27dbe47d25758548e94750d2965 adf701ad35559ea7d0284d6718ad507518778dc78100f48063e6a6bf3705c91f
 lib/codeql/rust/generated/Path.qll ffd26e9e5e3878f374bc1163d6ccb47072cc1d3abd937d0206bf1a7c62c843ff ffd26e9e5e3878f374bc1163d6ccb47072cc1d3abd937d0206bf1a7c62c843ff
 lib/codeql/rust/generated/PathExpr.qll 5a82e07a0c641fec4e8ce29656fa4e33f420b19b2556b418769f4d899a3dfae3 21920262735114d8304c3569f884828a390b95ca039afcc3e81c75d3f23df9ca
 lib/codeql/rust/generated/PathPat.qll 8aaa7fd5f3439ce567f4d6f729e3ba1e98ab24255070b7d4ba7bbde6506d97f5 10bd82ea0e846c96afa34cc6e467101a490a1191b4edc29a7154a6d93a467f1c
+lib/codeql/rust/generated/PrefixExpr.qll a3f6cc62e5a12acd253ea59cb6957fb7157aa709b888eed3cd974eb88e1346f3 830a5c729ed770df6247dff8adacce5dcf7f3a06649177ec9542e032cd4993ce
 lib/codeql/rust/generated/PureSynthConstructors.qll 5eb1fc4f6a04172c34ae31e4931e4bf1f8b72fbe414c5f644731a45372d13573 5eb1fc4f6a04172c34ae31e4931e4bf1f8b72fbe414c5f644731a45372d13573
 lib/codeql/rust/generated/RangeExpr.qll 1678fa524166552a36d73cad9d34213309b1989c1e427bc990b5c11a12588ce5 beb90978cea26a2ec9d3e8cc7b0b6a728ae952212ada5d6ad19319120f3218a8
 lib/codeql/rust/generated/RangePat.qll 2e96aece5ff2300659c2729c7037f7334790456d86160dc1e16ae99545c6ed0d eae4f95f9eaacbc2319ee67556dcc164527d82a6eaa5af59f6efce9caf3cba3b
-lib/codeql/rust/generated/Raw.qll 5b79017778c820d208741ac58b57e662279e52a34a63420be55742f22aa20998 2ba908f867b14f2fc0815f1265f70d71871162b3abfc9d9ee55761be794a91a3
-lib/codeql/rust/generated/RecordFieldPat.qll bff47b9ec13fd5747a9d4597feb3acaacd17876ed1ff411bcecf605c5909a01f adc2e30ae9169b861ce28c6c21431e9dd3fb3d3f832e99cb39f9f0ff6b1dbe2d
-lib/codeql/rust/generated/RecordLitExpr.qll c83dafa1f07a34c686cee81188045c9e04aba5ebd54c4778708f1b20ccb76702 da4c710226d6604c313bfd88bfbe005c6178db054860da265de616e9a5a8b3f3
-lib/codeql/rust/generated/RecordLitField.qll e7442557734e6c99b75bd24935d310e988585e68ffbbeedc1d9c8dbb2edfa32d 5bc6b951327caf00b39504f0efaeeb6ffca1dd67aa88bbf2633f238c6b973063
-lib/codeql/rust/generated/RecordPat.qll 2c1ef4a18148a5f0f755d04a3b9d1cda892f784e1741c2d90601983b2e130ec2 559d0ef93a3d93c9236eb2675ed5b89cc7dcfe599c52d784e6759954e478bd47
+lib/codeql/rust/generated/Raw.qll a6d94287077dff8af5d7d41af29589df1209cd22d996dcc41eb4c5c9084eb064 8d0159d571217c6c89b6cfd27975a9a5568051e2799e69c2d39bed9ed36822aa
+lib/codeql/rust/generated/RecordExpr.qll 7099ed90ed466a3c849fa78e3c934d83e0d0fd6d8be5fb774596f5048f299478 2efb691f6f611f852253ac08be90bba6e25b695b8def83b416110ca63a790d5c
+lib/codeql/rust/generated/RecordExprField.qll eb06236fbdb856169dfe50ae1ebf59384222de6670ca91c34eed647823dda4ce 750bc7ab1e156db3927d6dd206e9d2c9388519425c0e8665afd322a6594aa5e2
+lib/codeql/rust/generated/RecordPat.qll 80ea7a231c3e33c539d0fd892b1cdca63bada265650f5eeee6d76b45b091be0d 858af1b0c992af44ed148ded54c2ce7cbfcb9e747110255bccfe8dc33ca655cf
+lib/codeql/rust/generated/RecordPatField.qll d862245163667ede676e407f109ad44e4ce732de59ea9025b696dd8b9803fbef 60166a21d7deee112325bc301b5893cf3072c4d8d095dbf9080cb00269b71d40
 lib/codeql/rust/generated/RefExpr.qll 917d810bda28f3f4319770ae5c8eb4ae40887f3c97669fde072078d3f5536114 7793027298da1fb787f8823146507f1ccfab046977cc71743045b3c2f3b5da02
 lib/codeql/rust/generated/RefPat.qll 2a451553084306acc625f0433dc02546d07a1b6174a7d614379c9e8e28550118 40b845320c68283d0f6e47f17f4d4d893ef613f41422d35663582cfa3b5e7d75
 lib/codeql/rust/generated/RepeatExpr.qll 5a33101a5e2ba973beafe0d933ad5ca238050eb6f88638826dc37a712c05afaa c2cea180b7c068a3483cbda73168effe762ab2aa56bb8c590c8a15b6e54961ce
 lib/codeql/rust/generated/ReturnExpr.qll 3d8fffeb6420a35d78f4f2e2e3e4ccf1c8454022c50395be2e8446f29740ddfa cc9dd916dc18114469d2eed9b82f83518af0de78797ad98777b29a5055bc77df
 lib/codeql/rust/generated/SlicePat.qll 73dce5e310068357eb41e8c51923ff5c4054548db27987cde85735ddf071fc44 67fa0c285c110f18446689d1eaad9e82896df79d62999ad3f788fc295fa1d2c3
 lib/codeql/rust/generated/Stmt.qll 58b010f32956f2736a7b9ebb43467ecd03308a1f27c99e2b09bb925c349ac859 9859da4a4aa29b4f7ab47313b2dfe8baf9717a162fcd8bd62a7cbab4afd1886e
-lib/codeql/rust/generated/Synth.qll 8a3569fcb4678500a7d16673f8c1f014bfa9a857d0b8cdb0f77aa3eea5e31206 4e26058ad665dcb0ca95a1a504553fb5ec32500b4dc154cbc5854f48829bfb9f
-lib/codeql/rust/generated/SynthConstructors.qll 7b696491e21b37bf5de023b68838e5c09112995f0da436bfdde13c27dd35c4bf 7b696491e21b37bf5de023b68838e5c09112995f0da436bfdde13c27dd35c4bf
+lib/codeql/rust/generated/Synth.qll e0f3f080170ea9906c3969c0ace3b4852e9c99369bc8aba7b90f378e9aae0b4e 63b2dc0096f382743898d4958d7947bafa44318f192c251ba6b2d0cb4db0e44c
+lib/codeql/rust/generated/SynthConstructors.qll 59c6e7ff37e6b8a2eb9ef8cd4546adfa4caeba76fa0c13d36e9509c3cb0d689e 59c6e7ff37e6b8a2eb9ef8cd4546adfa4caeba76fa0c13d36e9509c3cb0d689e
 lib/codeql/rust/generated/TupleExpr.qll 0828181e2f1f1f233598eab367688615356f6b91451a40f8d812d247d93467fc 2473c52d3dfbec6c8cd66bd439c85959e854f617edf5afe545252a24304f2f2e
 lib/codeql/rust/generated/TuplePat.qll a1b22c20ca02497e9be8c6edaeaff214a669ecb0d2493890e79c28c485f512a1 5cc082ea99de61662b2d4c8b59f7a833236e7e448943e8ee894ab6066cc761c4
 lib/codeql/rust/generated/TupleStructPat.qll 089563349c9866f5703e9d306ba2a475d7d4002e7236dbbf2feeb89290b4d24c a77842d7262a7d19b175f239d1ee6550b3b66a4efe903c5112bb82c0abd7b05d
-lib/codeql/rust/generated/TypeRef.qll 62cda2a3bd01a8c8356f11e5deb38ead4a8af630df27d88b8f60b5458d263527 62cda2a3bd01a8c8356f11e5deb38ead4a8af630df27d88b8f60b5458d263527
-lib/codeql/rust/generated/UnaryOpExpr.qll e9bf11b289e400b03fa04cf337a6ab8b8dbbedea1f7cfae905cc7b0e525ea5a8 b54fa0d29d357bcbc25ec10ba5b81e1758ba512ccf822fe2d3847fbfac0e3f12
+lib/codeql/rust/generated/Type.qll abe5ef4f20ca98dfc300fdae2ecbf37faf70381feab4e2df4f2b39b193a4cc5f abe5ef4f20ca98dfc300fdae2ecbf37faf70381feab4e2df4f2b39b193a4cc5f
 lib/codeql/rust/generated/UnderscoreExpr.qll 964b77ddae265ad51fd03fcb7ef008fcb34eb5ea1a7ac0cd06ed84c1922fc07f 964b77ddae265ad51fd03fcb7ef008fcb34eb5ea1a7ac0cd06ed84c1922fc07f
 lib/codeql/rust/generated/Unimplemented.qll 0bebbf22b5a6484077ceacdd4d11a14665b95cc9e68b859f2d8218290842d1ad addecc8027e14ebbcb2eff4d038c16aa1f33f100e17ffaecd5de36b9a4c719a8
 lib/codeql/rust/generated/UnimplementedDeclaration.qll ab05ff0a0fde6535e89ccb9cf197d97d722773f08bee5c0c742abeda956829d7 067be19ce1a963e59635e08f9eb7a3a7284874f45c651bdb1fe36509b5567912
 lib/codeql/rust/generated/UnknownFile.qll ec9d1a3f15ecbf1743d4e39cb3b2f217aa9b54951c93302c2c4c238c3f0ce595 ec9d1a3f15ecbf1743d4e39cb3b2f217aa9b54951c93302c2c4c238c3f0ce595
 lib/codeql/rust/generated/UnknownLocation.qll a19e2838c52d702d268ae530f3dbd6fcd8bb28a237a52636a960f225454103cf a19e2838c52d702d268ae530f3dbd6fcd8bb28a237a52636a960f225454103cf
 lib/codeql/rust/generated/UnsafeBlockExpr.qll 52edde0daa57fea065f06537db05b5d442c63b3fa8777bf55ef2b2106c228ee9 52edde0daa57fea065f06537db05b5d442c63b3fa8777bf55ef2b2106c228ee9
-lib/codeql/rust/generated/WildPat.qll ce495ae13180df09d134f295d67fe2d9680372784c5095bbd9302ef92a2163f0 ce495ae13180df09d134f295d67fe2d9680372784c5095bbd9302ef92a2163f0
+lib/codeql/rust/generated/WildcardPat.qll 84da49dc571151b0c5e0661426546a53d499ce37fe927ca07f67c4977dd70e16 84da49dc571151b0c5e0661426546a53d499ce37fe927ca07f67c4977dd70e16
 lib/codeql/rust/generated/YeetExpr.qll 0e673204c592b6025570098b14e0378a0e0c68d13be9217ce1543f2781667d42 6546ce98d42717d4e6932e1add628591e488d063ef2a79bf093b831645342e21
 lib/codeql/rust/generated/YieldExpr.qll 8f28a069a4a97d17a10b92200766f57ef0d372b88dd650f909167c7b3d643cc7 a0d8578c4f69e042788b7e1a8c066663541f1782589ea7521741d0b801ca0661
+test/extractor-tests/generated/AsmExpr/AsmExpr.ql 009b9c7470dc71fbd8bb75e17b180df196407550f0e4ddb9b760b58033c80245 03c2a6c81038d1f81058cf9d59a239c72db7f08e32faf694dbd976e93aa6fac1
 test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr.ql fae7f09b653698aa78626a268711bbd8336c9d6572ab9fe85967a8bec69e33f5 91dd5893cefeb9fd45dea49962dfee5a373be790f5ab3569f79d9ffa05613033
 test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql de0941b5e2fad01300b77ac6db85ec37bd85b7d508b01e2b8a332c1ab9f6e787 7f9bdd81447cbc5a63b09c41a7d0edc15f826f7e672c518dc6fca08ae0107639
 test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getTail.ql 75f59d680d0f559dfc586306af2748c59c15789514a4ebca9f908ccc1fd63674 1a9f952485846fb93fc0afeabeb07845fa5c026520a0542302f971cb6b4d8e3e
 test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql bd2a401989b0f452b448fadd8d456dac9c46ca5ffe3775e5ac46e755782a4f20 c1922cdd6995a9c63eb841abf09f575bc78ec0be222062034b89ff63649a875e
 test/extractor-tests/generated/BecomeExpr/BecomeExpr.ql 5661cb0d7b2285af31207232de2b685e851e4d70224cb16045bc0221c107de43 1fd41642343791d9b69e0c633ea3318c0a855f51f50062cb58225820a7540d50
-test/extractor-tests/generated/BinaryOpExpr/BinaryOpExpr.ql 555112b0180f20ccf917bf83e4b04ab104b194a46fb072ebc0eb3b99c2b3b406 7c085b42741159fb9fcc2debf6f127e9b1a85901068697dc3794085ae732736e
-test/extractor-tests/generated/BinaryOpExpr/BinaryOpExpr_getOp.ql 176bcb2058a63081f2baca1b03b4a0264eede1606ad9396da915963fc00ca425 e4246975686c75b791041ea3f8b4dd428b0f6424d5833ab563acc23da1c77356
-test/extractor-tests/generated/BindPat/BindPat.ql 00c244d85566a165a9cf4d9b9238b76a5078c0864551d3a20ccd03bd1db24ca1 458db9febc0e9e6aafa1082a89017aaea60f3f93ee2fe9d507e82b79bb7ae222
-test/extractor-tests/generated/BindPat/BindPat_getSubpat.ql a5254ffc2e1d0adac0952a1f367a1b089dcc6a59a5e35ef64b5c187419a39c1b 47092f6e6143d0c9996454c89e515d6a3547530416ffba64be60a09b821c254e
+test/extractor-tests/generated/BinExpr/BinExpr.ql bb749e937074759573200bbb343398b6f4ecabb35fb3b35f8adcddadb0266c21 5e0b4d8d200ec43345775da8daa173ef79934d0e8259174823ba019fbc36db7d
+test/extractor-tests/generated/BinExpr/BinExpr_getOp.ql b50642b0c85f18bc96ef26f13251a3a34ef5bde2007092194324023c447446b2 8cfeba7f4bb76db88db4c4524f1840905f8c77a97212110dface353cfd6e2a11
 test/extractor-tests/generated/BlockExpr/BlockExpr.ql fd1bc52af4bad96423cb86b1eed02595e139e533f48533299e32b7b45360b47f 021b58c6e6cad40cc0707d0a78fd8c4ddbc529422d3bb9ac62c490b2abc1bb00
 test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.ql b02c87bba8bdbeffab05632133a17d36b355624d7521083cc6c0b02f88b2ba46 91141e01393ec04f4bb1f86373f5f25c837b13865ab540419050e6c547cc2690
 test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql 4de30a1e3c9de174688b8f9af57f72dfa6d9a2e3b3ab1b972ee69342ebd7ecad a6948240014d27fa9af7f56859cff2f8f7b44097f0bc47fbbb91b5be35e11d91
@@ -240,7 +239,7 @@ test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.ql dd9b5ac06b3677eea0
 test/extractor-tests/generated/BreakExpr/BreakExpr_getLabel.ql e338d2582b191d4ae1640504262d5a0d5ed23ddf850b5adfffb679a057f55e5e f57e618dac8c79d70e520d1508e70032662db8e4fc43b319365e195efcbdc847
 test/extractor-tests/generated/CallExpr/CallExpr.ql 2b91a02ad6f2ba6e200b2797dabda4dbcea08c7c2836d0a1be4bf47a7e7d786c 6830905e8993836f258c84b557f0f044dd5ebb32dad8d74089a903ca0d820eb5
 test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql 0c7e6eb1bab788050c51ae36b954925c48618c5d6fb3129522eada6d911288be 251ae5a7119a2cfe427650c38e7df5d3c0a1711aa7a2ced21f5022798a5088d0
-test/extractor-tests/generated/CastExpr/CastExpr.ql 40308d07046e6cdbe8d4494c41334c7191b377c589cac97776da6377fe0a4c34 47716185cbe23a7bbb6d5e69d737aafd1cad66024ba6600766cf9b7871546db6
+test/extractor-tests/generated/CastExpr/CastExpr.ql 302ed396ea5889cfb7d36d307055cb81965534c55ea00a8dcc2a4949de1f230b a32fd4ef4f6d0410a8d57a150d5bec8bc0df9aaf8fbab74d17b52a0665e7c488
 test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 75fd05fb47e90426745d6c8ffff35cbcba3fb0792317155d0a139b7a4b87dd14 865a776a3312ef5e93a9a857a6ad7d66233e58547c4fa3ce924dbb320a324e2c
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArg.ql 48fb8656a350ba16cc3cd291692b542dca137587ee971999c439700c74e6dcba 5ff21525959142237ee1a32c9feacf331083fb40502df6ddf78dfb8d93caed66
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.ql 34f8b8fc82e0c798f3cddc7ad1bb80a361c95da9d8a768fb787d6ffc3be1c755 9c14ee19cf74f516d201b8be72fe3496e425cfd42db223fb537cc92515e2b021
@@ -255,19 +254,20 @@ test/extractor-tests/generated/ExprStmt/ExprStmt.ql 037695af057183ef9e35569c9255
 test/extractor-tests/generated/FieldExpr/FieldExpr.ql 6d85c8b85905baf66ae1f6ed716e42530d814f86261d98eddceab861939227e5 5765fb0376978a9006e2dc175bb224c5c944f19ddf628a2b933b1bebf81015a2
 test/extractor-tests/generated/File/File.ql dec43be882fad904fab0c6447ca93633d801cb08ff8bec309befde7d2b9e5dda 74e1f1d698558c35fa03935cc34f4c8145d376b56d7657b18aeb338f5ca752cf
 test/extractor-tests/generated/Function/Function.ql c49434420dbb6fc3d9e6294161dcd3d3b306fae5ba5c85b610e534b8b15ef74c fe02208b673b74eebed92b5cbb3a8a06c31c0681eb28f3e596515663f14fa9e2
-test/extractor-tests/generated/GenericArgs/GenericArgs.ql 206e6d302d0b76b7b4493bcbb2836509b7301873365a32c1769da084db243474 47dd2c22290ea8e726614419247db69daaf31fc6a0a49d3e2e3e5ce281bc1e1f
+test/extractor-tests/generated/GenericArgList/GenericArgList.ql f03097d3a9840ba08efa367d9da32011da8474e078eb13e14dd8a17955689887 57b9934868d324e7e99e9e79b8c3e2a5f760ba9ed6bed98b537dc3f5580253bd
+test/extractor-tests/generated/IdentPat/IdentPat.ql dee6892ebf23f374f8e0403e7f6c4006f958159ecffc96dde8e4244e689ed7b4 0b48b337bc9ddc184ca240e3aafd9f5fdcfb1348f0a4e80106d4ce6541567f84
+test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql 725da30485e43fb0c42e6f888a14eba4e2f9d75cc5144d2c9831ccac5eb10496 e680e324500a34d3c70958f9976f5e3643e3403475ef57ccaf6d7a402b40f30f
 test/extractor-tests/generated/IfExpr/IfExpr.ql 4463607934fd504a6b2d65829d8e336308af6908cf12387fe8bbaa3c8c5360bd 28b5580a4e628286023b5d0de549d087f0a4224ecbb02bc7b3197d8f404b5066
 test/extractor-tests/generated/IfExpr/IfExpr_getElse.ql 4b4f3edfd0ed419fc580f3def6005760711874cc442c42ea817d70053ec07fca f97f65f91aa3f4967a2d3de836235d9c9a15f424cfced79d84f2580abf2c6077
 test/extractor-tests/generated/IndexExpr/IndexExpr.ql 6cfc282e84f9844630ebdb4dfc60f645d18a737d9b0e9f014c08476c935a92f7 86a336ac0193f0d6cc6fc7427b0423867a10323de0f95cda88f76a178c213430
-test/extractor-tests/generated/InlineAsmExpr/InlineAsmExpr.ql 34af9ef48d7d8d6dbcb063170e2a818d2c288ea964df3173248866f790e12fc4 594784fda228525bcd2e17a9b9a07634346866d43d2b4ae262ba7a786c698932
 test/extractor-tests/generated/Label/Label.ql ba8cbde90392eef8f9faf6177776272dfb000abac260c6231fb00bff46ac1a39 4718da4da854e89513758c964f11117e329ed00e548e14890ec916c93500c529
 test/extractor-tests/generated/LetExpr/LetExpr.ql b311fb10d3a65cf682ced02aa4c9b589a84cb92adc653fbe630d471d88ca5f8a 3d93cc0cda8a6f34090d3000fee4a14e31fcf0fdc4d201a8d414e27cb8b9e4f4
-test/extractor-tests/generated/LetStmt/LetStmt.ql 401f46acb7db90d6b51d6377e9257341fb2e45599ccd38e3e1afe7ce347536ee 47315699ae0f539dabdc040e238c27463790c710aa78fa589954cd800d35911d
+test/extractor-tests/generated/LetStmt/LetStmt.ql 842f58d8d744a567c44bf3742e4a9146339184903e0e119506b17f2958596bee 4900bc11ddedca66c8992b6384cd7bc1ae084bab93452bbf54e76b2e4342e46b
 test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql 88bd37786d0a738d2cb0c861a2411236d9dce09b98ff050b5f03b0888ed2f521 622d96d1e99fd174c284b7a3f05eddf30faf667cddff2eb942e01128488b398d
 test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql 6e9a36a2a226ea0df1f01886bbd4e14997eb91f5b9422e37ce4985fd15a80622 ffbc3d9278e10aa78304cbc8876d96fe678a1d2f52ad170f651f842d1787156b
-test/extractor-tests/generated/LetStmt/LetStmt_getTypeRef.ql 845088548371993a0926e56d8493c72d2ca9b4b901f93bbf4f3b305897e59395 3586f8acbf01230fa919c2303b4f8c07b5cef30855902776967d60b4d34ad90f
-test/extractor-tests/generated/LitPat/LitPat.ql 002578790ccd30a33cd107214930d6c3c49dfe5c166460fec44e2037b3802b27 7f5c2d4c18f6d5b06c81e49dc08992522148acf7f04c24d0b8914e9fb504f007
-test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql 9fb9c6336d1e3a657d988ffb53a43ce66b8403e46bea05d73d546ae774a647bc 708e2878eca3e9661e8b0d54180b4a6f512d9233178e9ad5683a1f72fa9656aa
+test/extractor-tests/generated/LetStmt/LetStmt_getType.ql 3326644b606a846afbd2eaf8ed4223eadb0061e23e953d085d2a3df0935ef534 c414e5a1f927779249a26c370ba07c82c99d489cb65f984003674b288a690109
+test/extractor-tests/generated/Literal/Literal.ql fac18e7ec3d9a78223be0de6f318eb93e9986fd7cb353a68fa853c96db4bd0b9 048ad873316f227ea289533d2bb6f4bafab4625f270b109e29dde28b0c3828e6
+test/extractor-tests/generated/LiteralPat/LiteralPat.ql b7636712d6a5e0b76c0195444514284b9d81ea948d42f19e683e134fe61f8a9a 9836c86f457b967ee9f5dd06f3c3206131d41bc838df60b5bd0ee8369a9a88fc
 test/extractor-tests/generated/LoopExpr/LoopExpr.ql 58dabe29df959b265fa568cdde1b589d65ca8649c8aae0f30079565c1106ad72 929fd3c5c4f01f47f926c49f1a519d415063ff23d5e1fb2f2e8f72bb5aa7fdd6
 test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql 1febfb8cff9b4f7ba1a658a2832238d2355f0f609778af33a3877e977aaf1805 6b9c008b041beb1c0a7e249b7f4a1bd5cea0885f82543a8909a23a7068f1f837
 test/extractor-tests/generated/MatchArm/MatchArm.ql bf1ff34940f8682e69450bc3429b0e071ae2e31b94699cd7579dddf6126f821b 83329681067983788ac712fd72299719e4cd1ce85cea613e373751e6bed05f42
@@ -281,28 +281,29 @@ test/extractor-tests/generated/MissingExpr/MissingExpr.ql bb85675a4b8a8118913fd9
 test/extractor-tests/generated/MissingPat/MissingPat.ql 7a9ee46a40f6bfd31336beb6d9f6256fb8099cb6c052ba3131a95a45716224a4 619375e7dc6d95b8f1d1c958217350fc1553882f0f41ebd9f7a071d6947232d8
 test/extractor-tests/generated/Module/Module.ql 0afd07f619ee68a7f7270ebf9a4a6b7d6849448924083369c4101650854e1e77 b3239a1ebdde858179f4eba19e6c0cb3ea28b823f423fdff90f7b870b7fbf003
 test/extractor-tests/generated/Module/Module_getDeclaration.ql 8343f2b4be470a502c4bfdba9ef74173a440f45b7300aa9d517c2bd68ccac36a fc7666228fd1d3fe4fc63466aa04ee8adf62e9fe0008fd92ea337c8585a7fef5
-test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql 579e667797cb071784fa4c8e4e79bffd8b7a797bc70a68054ab51950dbebf4f0 dd92801d8909d83be1f824a2dfc599551c11b63ad1e96593e22d3b43464d7cf1
+test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql cff3a4a196eeee98e812ae7c8bbab4a381cc3f0462566b699fd7011e84925476 60c002bb0686b853e72b12f092433ab6f5ada0f556629e0711ce8b23b260fa89
 test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql f18b39caeb2d9410cd1c4b472c31477da8dcff27ad43837e57c679a8eda0ca76 bb30037b5001d78585df9d23d9c4c73d1f864bb8b3778f402838f18acacfadc6
 test/extractor-tests/generated/OrPat/OrPat.ql 51d9a0f5993510542a2cca353c1ca48ba1e5fb97a65bee7f02398cd90debaa41 06e0936b80a07a16e22fad3a3a541000f170fd5ad301a3170b98a91f51d09144
 test/extractor-tests/generated/OrPat/OrPat_getArg.ql 693d62aa9817ce7661b4698c2948bca6567c1376b2ae832f3020462e8ab8d2ee 1fd9809826c6f2dece3014299f1d70210c9f23e5eefbd04b1d6024e1ecd46209
 test/extractor-tests/generated/Path/Path.ql 331bcbea004111727f36fb9325b53bf1ac87cc62ffcd68659636fa68786529fd 94ca6f7c3df16779cf6b340099330e5e1122d2e58708a8ab2aaf0f4c78a92200
 test/extractor-tests/generated/PathExpr/PathExpr.ql 3013e12d5dab5c38c5b8fcaec59e78a3c6477f4edc8b01b078ecbfe7b8f82ffb 40427c9d420456174e1524ed046a5f445b9b72ca8b87abefb6c9498d4c809fc5
 test/extractor-tests/generated/PathPat/PathPat.ql 57dd735fe179cc1b91ee66b7849bcdd1aabe661762e88e1678cdaaa53526a10c 1734a45d47ee484fbf2cadb5620b28874a904fe944030a9e39166a6a25aa0de7
+test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql e69ba11e6509519bf8cc527d21aacc330eba756a49b2b6c88422837aa0cbfe28 77424ea4db666f93de683562096d435dc88f141bfc0b1122187067299a775183
 test/extractor-tests/generated/RangeExpr/RangeExpr.ql c6e56a997c3543818ce6ffadabbab3bb233a099caa9e06e36519ac02f666dc93 0dcabe2df4c8ab3ba7b171cefb009a09c442ff71373f828c6c667bbb9eee2e45
 test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.ql 063ee8f6146110b97f4ee8944a5f37f0dd7cd5be049f13546d42a888a973d826 1184cc1fe937a01e9d12577478750be1497d4f99231486ae6d75104e7304eeb2
 test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.ql 6a7eb53c6b2a4587212f65c522387f726b2b9b3f204708a2a764e238aec8d89f 8b3095fdd9c6900eef656d4e9e18f5f4866b285634cc725e73246976af20450c
 test/extractor-tests/generated/RangePat/RangePat.ql 4cb48cd2a96ecaa3998f70e2ef5b117749448d9166af743d3b8cfe6f90938665 d5a894f6e56b28c1438e37191ddd623d89e4eb07d5c979ae3795119de9d01e49
 test/extractor-tests/generated/RangePat/RangePat_getEnd.ql 823307f0e43fe6c02843417d254c6584e2ead04b961158f04494eb8197b9905e 016805e6063be3846cef24a5680f4f17e68ee9714430120aa91fface3461d97c
 test/extractor-tests/generated/RangePat/RangePat_getStart.ql 1457a38514bf9fa7de44a4e5e3dd5218410149133074252bdf64d5eef5197d43 e9a6393aed20c710b2f19bc6482262664d8bc0245b5dfc35f636aa7966e0dba4
-test/extractor-tests/generated/RecordFieldPat/RecordFieldPat.ql bd8fedb8c890b305247815d7a8ba8dd3e7dbb76283492edde9f9e7374bdfcdc5 b54f364705483b1f21fe59d190bddcb12959182f8aa596ae5f156abfdd08761c
-test/extractor-tests/generated/RecordLitExpr/RecordLitExpr.ql d31550e195d6642736668ee2a0b0c370546dbd8d8ba77c7a0d266b4acb5253c7 8ff659dcbc2985dcfc04246ad16294701db1c012a37d6743e1befe5746c25def
-test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getField.ql 112614052020c4c775f77e3773ad83b6747bbf30a4d0fea70642f570e2879896 969642f51f1d106f096fcc77002bba057054180c3115ebd8ffd8a69fd0d8f24d
-test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getPath.ql d01bae55f1e11a8527e8514262e6b16ec72fad9d294c33296a6c1cc750d910c1 ff680b4716a360b7b91a8d83ba8fdfa570f61369a25b17bcaf9b42a3987257df
-test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getSpread.ql 52cb0c020da2e5cf42ab94a9a2379c1ab5f7f6e2ce3763cb1d17e4173841b997 ed8fc6fc13d0f2be9c9c2f0d38ae1dc05824d44e1f1a72844b21f948d3f330c7
-test/extractor-tests/generated/RecordLitField/RecordLitField.ql d27c55513ab2ee8ac62d05f3552476ad5d8c05eb2e09f7cd37f8c4821aab4979 6545caed544f2898706d2cd20854cd15caf2198326c38f69814d50e69954a089
+test/extractor-tests/generated/RecordExpr/RecordExpr.ql f9760a715119ffa6a888c25c9d786457e1c982933524dbd5cae974c4ce36fff8 4d2b69b2f4639eb598c2642b42c2c159e00f13ceb39e6c15c5998571861f6bd0
+test/extractor-tests/generated/RecordExpr/RecordExpr_getField.ql ec56578c4110cfb348c5b0e298edfe972e26af62166a3e75fbb3c307cab83436 ef69eb85a20c9de83de98babfbf158b281200527fa71fd44cbeb1a05636ed62e
+test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.ql 6989f2b785813685e2233476abb13c0041a417d6a7e33179336739160f2569b7 fa1e08ee46ac863fdf69fc71b1823f18db6195aa66ea4a228c7c8eee3b448130
+test/extractor-tests/generated/RecordExpr/RecordExpr_getSpread.ql d221a3847a077d3574de6ea15ccf433f1bea24baa1080eb90f9e3d104f1ba22a 97b325e5fa8bc8af4968dc96bf5930d05bb4083d7a945ab6a34a55a7016da09d
+test/extractor-tests/generated/RecordExprField/RecordExprField.ql c533740aecaae604d5c7d3261aa8df511d837b19fd74b4f88897373da6d932bd 037e33faf0195cb67314f7eef9571088391586366bf71a6fef3ef83845fb573c
 test/extractor-tests/generated/RecordPat/RecordPat.ql 485dab5489881a9040d841999fdc9eedd5fd34ed2c0847f9e9a8343c0d24f26d fc3a104ffd48af0d26ea3f2266f0fa5acd32278f8514b6f261a5fd77e5ff90d9
 test/extractor-tests/generated/RecordPat/RecordPat_getArg.ql c23dbde4d3c8ad1ef418e06a7552390ebbc396a218a660b103d9be08a7111960 5a10690bac5446a52f2d8b0dd2c4d7dd742c4a60e91b47a5a7f617396ce0adb0
 test/extractor-tests/generated/RecordPat/RecordPat_getPath.ql d2730342a2203ad7d6385a64d53874050bd084fe74c05168df223499f7e86100 0d223ccb9c127100557b70da89f0c6ec7c559babc885bff46b97f5cb7b877e63
+test/extractor-tests/generated/RecordPatField/RecordPatField.ql 70babedca815ef3a5759a398993cd20645a43d45ada0e71ba68318811274606e 24635139cc3b95bfa36921008ff1db0455257ed0a0384b10ac267dbd4a125fb9
 test/extractor-tests/generated/RefExpr/RefExpr.ql e859cd59dbaa5aa5555aa13d4a75b7bfe2dbdb2d5c50675f3753adaaaabdedc2 d330ee941e9932054c32d0be5a52f38f285e4dc529821759ea38633f8ddbd517
 test/extractor-tests/generated/RefPat/RefPat.ql a5fa2a4435c11a935c0ed2dfb925874d44484dd0e0a6e31d50db7c1f63b1efaf e85077fdeb58983542b8a78f65bfc8498121fa699f5798c48dc59f1b74fa0b04
 test/extractor-tests/generated/RepeatExpr/RepeatExpr.ql a883874b6db9c084123b795ddc4b972f41da554a07d41b7d42242a4b4156ccc8 4aef5ebe3124ea3e13851df3e65d430b64740a3fda2fa4be4c6a3634e9f00fc1
@@ -321,13 +322,12 @@ test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql 2d14109d39c7519a
 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getArg.ql f308a61384af5feebc58028a95d26499b6a666c7599b30aed33efbaca86c06b2 f298af5a861410281dee6cf22d3ceaa286a5be4d27968750321f2d016c34a0dd
 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getEllipsisIndex.ql 47e84e7db2d1cc23aca4c28b5bba2826eeeaba07377eb8c8de5141bcb9c36ab8 a5c1d23e2521c38b12c0942c88403bea5a0d77a4763f273ffdf48eaa000a00ff
 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql 5f19a261ade6e3249029d7268cc0385092234a896e72ccdf8376a592be1d545e bb4fefecefaa2d9634f31026e5ec8bff561bacf55a4105727032bab08fdbdea3
-test/extractor-tests/generated/TypeRef/TypeRef.ql 73283955206c7e1ef71009969826e34c7f37624547c2ef39c80a23583cb37216 fedf7995b69805ce7ccc4e29aa592043cff2f7ac6730a70d27ed883d922b4684
-test/extractor-tests/generated/UnaryOpExpr/UnaryOpExpr.ql 3e530c5beba93710b686d0bdaa6edfa58e13357be48bbf038c3a47c280d0bf08 0b0003cbebf44d0d2e3bcc1b318e0a4e90638dfcf3679ef6924a8461e81feabb
+test/extractor-tests/generated/Type/Type.ql e4e62ad1209870ec39455fbcf3b2e6fcb8c46e7b6fed9b9054cc4a7c0999529d 42ee022e1811b81fb3912fef9f6b55b15fc2ed99f3e48d2a8ca9375c7c6d71bd
 test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql 54cc3f7e6e9b9ac58922842dcd1960250e8bbb7ede5a63134ae622abc447be1e 1d5558d4ec9e4a1a510f37206772af3bf41015a99f1e9b83cc530db496dc2a5f
 test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql ec74c75dedb4e669b3e6eba8f7568c415f5172c1ebd4f73e4710d401928448cc 8923aaaf5c5c70005aabc9696879ea73c5d9d83507c8db5a237cbab037953509
 test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql a743dbb15736b809e30769e1ea136afc9f0226885139150d6d1a5d353b6cb6fb 09849f178208406742007009da7f9b359b814477190d9d95370b94378e60be17
 test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getTail.ql 4409e1c39b7729dc393a0d60f9d6aa0dfeed294a090285442de85ce746095eb5 572d88a9c879905519d9a63d5937949771f9c163ee2ea8ba4eabe0f16c28ca67
-test/extractor-tests/generated/WildPat/WildPat.ql 3243e91456ddd53ba03241a36d95671b3e7927f2d47be8b6c16b058a873875ec ac0ec7d99a2decad380e564dec6bec27a5bb98171e7458b6a1fa31c0d59e6c44
+test/extractor-tests/generated/WildcardPat/WildcardPat.ql 375da3e10385e17ff4005528e08629ce4aa6a796b2fb3aa20178f75615af0ede 16823ab6240a113c005136cb3747bd3e69de4b4e341eafb2d1f39956c7de749d
 test/extractor-tests/generated/YeetExpr/YeetExpr.ql c5919f7f2f42b7dc08b0fefc553bb602a772925c226c943e2c96158adaea7797 a5bfdf225d9f9653f5aae00f30744d03f7d1045ddb4469f23e57194b3b1a2f8e
 test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.ql 4ab79339d3f0a2a0334f66a7513ae5d27bcd608fdaf557da71757896e20f81b7 6d7b9da72a325b83539da4f353df2a0d4fcd11493773547ac89031525e7cd1fa
 test/extractor-tests/generated/YieldExpr/YieldExpr.ql 3bf0ed6b4ec11dbe8b6af6cb0c51813c193e17bd9df0a23cdb1bf39cecddd915 0ff0219d5356bd9cb62df995577909898b4b28e0ecd860339361731e4f64e703
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -1,6 +1,8 @@
 /.generated.list linguist-generated
 /.gitattributes linguist-generated
 /lib/codeql/rust/elements/ArrayExpr.qll linguist-generated
+/lib/codeql/rust/elements/AsmExpr.qll linguist-generated
+/lib/codeql/rust/elements/AsmExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/AstNode.qll linguist-generated
 /lib/codeql/rust/elements/AsyncBlockExpr.qll linguist-generated
 /lib/codeql/rust/elements/AsyncBlockExprConstructor.qll linguist-generated
@@ -8,10 +10,8 @@
 /lib/codeql/rust/elements/AwaitExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/BecomeExpr.qll linguist-generated
 /lib/codeql/rust/elements/BecomeExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/BinaryOpExpr.qll linguist-generated
-/lib/codeql/rust/elements/BinaryOpExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/BindPat.qll linguist-generated
-/lib/codeql/rust/elements/BindPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/BinExpr.qll linguist-generated
+/lib/codeql/rust/elements/BinExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/BlockExpr.qll linguist-generated
 /lib/codeql/rust/elements/BlockExprBase.qll linguist-generated
 /lib/codeql/rust/elements/BlockExprConstructor.qll linguist-generated
@@ -46,14 +46,14 @@
 /lib/codeql/rust/elements/FieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/FieldExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/FunctionConstructor.qll linguist-generated
-/lib/codeql/rust/elements/GenericArgs.qll linguist-generated
-/lib/codeql/rust/elements/GenericArgsConstructor.qll linguist-generated
+/lib/codeql/rust/elements/GenericArgList.qll linguist-generated
+/lib/codeql/rust/elements/GenericArgListConstructor.qll linguist-generated
+/lib/codeql/rust/elements/IdentPat.qll linguist-generated
+/lib/codeql/rust/elements/IdentPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/IfExpr.qll linguist-generated
 /lib/codeql/rust/elements/IfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/IndexExpr.qll linguist-generated
 /lib/codeql/rust/elements/IndexExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/InlineAsmExpr.qll linguist-generated
-/lib/codeql/rust/elements/InlineAsmExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/ItemStmt.qll linguist-generated
 /lib/codeql/rust/elements/ItemStmtConstructor.qll linguist-generated
 /lib/codeql/rust/elements/Label.qll linguist-generated
@@ -62,10 +62,10 @@
 /lib/codeql/rust/elements/LetExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/LetStmt.qll linguist-generated
 /lib/codeql/rust/elements/LetStmtConstructor.qll linguist-generated
-/lib/codeql/rust/elements/LitPat.qll linguist-generated
-/lib/codeql/rust/elements/LitPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/LiteralExpr.qll linguist-generated
-/lib/codeql/rust/elements/LiteralExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/Literal.qll linguist-generated
+/lib/codeql/rust/elements/LiteralConstructor.qll linguist-generated
+/lib/codeql/rust/elements/LiteralPat.qll linguist-generated
+/lib/codeql/rust/elements/LiteralPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/LoopExpr.qll linguist-generated
 /lib/codeql/rust/elements/LoopExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/MatchArm.qll linguist-generated
@@ -91,18 +91,20 @@
 /lib/codeql/rust/elements/PathExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/PathPat.qll linguist-generated
 /lib/codeql/rust/elements/PathPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/PrefixExpr.qll linguist-generated
+/lib/codeql/rust/elements/PrefixExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/RangeExpr.qll linguist-generated
 /lib/codeql/rust/elements/RangeExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/RangePat.qll linguist-generated
 /lib/codeql/rust/elements/RangePatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/RecordFieldPat.qll linguist-generated
-/lib/codeql/rust/elements/RecordFieldPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/RecordLitExpr.qll linguist-generated
-/lib/codeql/rust/elements/RecordLitExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/RecordLitField.qll linguist-generated
-/lib/codeql/rust/elements/RecordLitFieldConstructor.qll linguist-generated
+/lib/codeql/rust/elements/RecordExpr.qll linguist-generated
+/lib/codeql/rust/elements/RecordExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/RecordExprField.qll linguist-generated
+/lib/codeql/rust/elements/RecordExprFieldConstructor.qll linguist-generated
 /lib/codeql/rust/elements/RecordPat.qll linguist-generated
 /lib/codeql/rust/elements/RecordPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/RecordPatField.qll linguist-generated
+/lib/codeql/rust/elements/RecordPatFieldConstructor.qll linguist-generated
 /lib/codeql/rust/elements/RefExpr.qll linguist-generated
 /lib/codeql/rust/elements/RefExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/RefPat.qll linguist-generated
@@ -120,10 +122,8 @@
 /lib/codeql/rust/elements/TuplePatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/TupleStructPat.qll linguist-generated
 /lib/codeql/rust/elements/TupleStructPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/TypeRef.qll linguist-generated
-/lib/codeql/rust/elements/TypeRefConstructor.qll linguist-generated
-/lib/codeql/rust/elements/UnaryOpExpr.qll linguist-generated
-/lib/codeql/rust/elements/UnaryOpExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/Type.qll linguist-generated
+/lib/codeql/rust/elements/TypeConstructor.qll linguist-generated
 /lib/codeql/rust/elements/UnderscoreExpr.qll linguist-generated
 /lib/codeql/rust/elements/UnderscoreExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/Unimplemented.qll linguist-generated
@@ -131,20 +131,20 @@
 /lib/codeql/rust/elements/UnimplementedDeclarationConstructor.qll linguist-generated
 /lib/codeql/rust/elements/UnsafeBlockExpr.qll linguist-generated
 /lib/codeql/rust/elements/UnsafeBlockExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/WildPat.qll linguist-generated
-/lib/codeql/rust/elements/WildPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/WildcardPat.qll linguist-generated
+/lib/codeql/rust/elements/WildcardPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/YeetExpr.qll linguist-generated
 /lib/codeql/rust/elements/YeetExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/YieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/YieldExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements.qll linguist-generated
 /lib/codeql/rust/generated/ArrayExpr.qll linguist-generated
+/lib/codeql/rust/generated/AsmExpr.qll linguist-generated
 /lib/codeql/rust/generated/AstNode.qll linguist-generated
 /lib/codeql/rust/generated/AsyncBlockExpr.qll linguist-generated
 /lib/codeql/rust/generated/AwaitExpr.qll linguist-generated
 /lib/codeql/rust/generated/BecomeExpr.qll linguist-generated
-/lib/codeql/rust/generated/BinaryOpExpr.qll linguist-generated
-/lib/codeql/rust/generated/BindPat.qll linguist-generated
+/lib/codeql/rust/generated/BinExpr.qll linguist-generated
 /lib/codeql/rust/generated/BlockExpr.qll linguist-generated
 /lib/codeql/rust/generated/BlockExprBase.qll linguist-generated
 /lib/codeql/rust/generated/BoxExpr.qll linguist-generated
@@ -166,16 +166,16 @@
 /lib/codeql/rust/generated/FieldExpr.qll linguist-generated
 /lib/codeql/rust/generated/File.qll linguist-generated
 /lib/codeql/rust/generated/Function.qll linguist-generated
-/lib/codeql/rust/generated/GenericArgs.qll linguist-generated
+/lib/codeql/rust/generated/GenericArgList.qll linguist-generated
+/lib/codeql/rust/generated/IdentPat.qll linguist-generated
 /lib/codeql/rust/generated/IfExpr.qll linguist-generated
 /lib/codeql/rust/generated/IndexExpr.qll linguist-generated
-/lib/codeql/rust/generated/InlineAsmExpr.qll linguist-generated
 /lib/codeql/rust/generated/ItemStmt.qll linguist-generated
 /lib/codeql/rust/generated/Label.qll linguist-generated
 /lib/codeql/rust/generated/LetExpr.qll linguist-generated
 /lib/codeql/rust/generated/LetStmt.qll linguist-generated
-/lib/codeql/rust/generated/LitPat.qll linguist-generated
-/lib/codeql/rust/generated/LiteralExpr.qll linguist-generated
+/lib/codeql/rust/generated/Literal.qll linguist-generated
+/lib/codeql/rust/generated/LiteralPat.qll linguist-generated
 /lib/codeql/rust/generated/Locatable.qll linguist-generated
 /lib/codeql/rust/generated/Location.qll linguist-generated
 /lib/codeql/rust/generated/LoopExpr.qll linguist-generated
@@ -192,14 +192,15 @@
 /lib/codeql/rust/generated/Path.qll linguist-generated
 /lib/codeql/rust/generated/PathExpr.qll linguist-generated
 /lib/codeql/rust/generated/PathPat.qll linguist-generated
+/lib/codeql/rust/generated/PrefixExpr.qll linguist-generated
 /lib/codeql/rust/generated/PureSynthConstructors.qll linguist-generated
 /lib/codeql/rust/generated/RangeExpr.qll linguist-generated
 /lib/codeql/rust/generated/RangePat.qll linguist-generated
 /lib/codeql/rust/generated/Raw.qll linguist-generated
-/lib/codeql/rust/generated/RecordFieldPat.qll linguist-generated
-/lib/codeql/rust/generated/RecordLitExpr.qll linguist-generated
-/lib/codeql/rust/generated/RecordLitField.qll linguist-generated
+/lib/codeql/rust/generated/RecordExpr.qll linguist-generated
+/lib/codeql/rust/generated/RecordExprField.qll linguist-generated
 /lib/codeql/rust/generated/RecordPat.qll linguist-generated
+/lib/codeql/rust/generated/RecordPatField.qll linguist-generated
 /lib/codeql/rust/generated/RefExpr.qll linguist-generated
 /lib/codeql/rust/generated/RefPat.qll linguist-generated
 /lib/codeql/rust/generated/RepeatExpr.qll linguist-generated
@@ -211,26 +212,24 @@
 /lib/codeql/rust/generated/TupleExpr.qll linguist-generated
 /lib/codeql/rust/generated/TuplePat.qll linguist-generated
 /lib/codeql/rust/generated/TupleStructPat.qll linguist-generated
-/lib/codeql/rust/generated/TypeRef.qll linguist-generated
-/lib/codeql/rust/generated/UnaryOpExpr.qll linguist-generated
+/lib/codeql/rust/generated/Type.qll linguist-generated
 /lib/codeql/rust/generated/UnderscoreExpr.qll linguist-generated
 /lib/codeql/rust/generated/Unimplemented.qll linguist-generated
 /lib/codeql/rust/generated/UnimplementedDeclaration.qll linguist-generated
 /lib/codeql/rust/generated/UnknownFile.qll linguist-generated
 /lib/codeql/rust/generated/UnknownLocation.qll linguist-generated
 /lib/codeql/rust/generated/UnsafeBlockExpr.qll linguist-generated
-/lib/codeql/rust/generated/WildPat.qll linguist-generated
+/lib/codeql/rust/generated/WildcardPat.qll linguist-generated
 /lib/codeql/rust/generated/YeetExpr.qll linguist-generated
 /lib/codeql/rust/generated/YieldExpr.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/BinaryOpExpr/BinaryOpExpr.ql linguist-generated
-/test/extractor-tests/generated/BinaryOpExpr/BinaryOpExpr_getOp.ql linguist-generated
-/test/extractor-tests/generated/BindPat/BindPat.ql linguist-generated
-/test/extractor-tests/generated/BindPat/BindPat_getSubpat.ql linguist-generated
+/test/extractor-tests/generated/BinExpr/BinExpr.ql linguist-generated
+/test/extractor-tests/generated/BinExpr/BinExpr_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
@@ -257,19 +256,20 @@
 /test/extractor-tests/generated/FieldExpr/FieldExpr.ql linguist-generated
 /test/extractor-tests/generated/File/File.ql linguist-generated
 /test/extractor-tests/generated/Function/Function.ql linguist-generated
-/test/extractor-tests/generated/GenericArgs/GenericArgs.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/InlineAsmExpr/InlineAsmExpr.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_getTypeRef.ql linguist-generated
-/test/extractor-tests/generated/LitPat/LitPat.ql linguist-generated
-/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql linguist-generated
+/test/extractor-tests/generated/LetStmt/LetStmt_getType.ql linguist-generated
+/test/extractor-tests/generated/Literal/Literal.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
@@ -290,21 +290,22 @@
 /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/RecordFieldPat/RecordFieldPat.ql linguist-generated
-/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr.ql linguist-generated
-/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getField.ql linguist-generated
-/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getPath.ql linguist-generated
-/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getSpread.ql linguist-generated
-/test/extractor-tests/generated/RecordLitField/RecordLitField.ql linguist-generated
+/test/extractor-tests/generated/RecordExpr/RecordExpr.ql linguist-generated
+/test/extractor-tests/generated/RecordExpr/RecordExpr_getField.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_getArg.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
@@ -323,13 +324,12 @@
 /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/UnaryOpExpr/UnaryOpExpr.ql linguist-generated
+/test/extractor-tests/generated/Type/Type.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/WildPat/WildPat.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
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -4,12 +4,12 @@
 */

 import codeql.rust.elements.ArrayExpr
+import codeql.rust.elements.AsmExpr
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.AsyncBlockExpr
 import codeql.rust.elements.AwaitExpr
 import codeql.rust.elements.BecomeExpr
-import codeql.rust.elements.BinaryOpExpr
-import codeql.rust.elements.BindPat
+import codeql.rust.elements.BinExpr
 import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.BlockExprBase
 import codeql.rust.elements.BoxExpr
@@ -31,16 +31,16 @@ import codeql.rust.elements.ExprStmt
 import codeql.rust.elements.FieldExpr
 import codeql.rust.elements.File
 import codeql.rust.elements.Function
-import codeql.rust.elements.GenericArgs
+import codeql.rust.elements.GenericArgList
+import codeql.rust.elements.IdentPat
 import codeql.rust.elements.IfExpr
 import codeql.rust.elements.IndexExpr
-import codeql.rust.elements.InlineAsmExpr
 import codeql.rust.elements.ItemStmt
 import codeql.rust.elements.Label
 import codeql.rust.elements.LetExpr
 import codeql.rust.elements.LetStmt
-import codeql.rust.elements.LitPat
-import codeql.rust.elements.LiteralExpr
+import codeql.rust.elements.Literal
+import codeql.rust.elements.LiteralPat
 import codeql.rust.elements.Locatable
 import codeql.rust.elements.Location
 import codeql.rust.elements.LoopExpr
@@ -56,12 +56,13 @@ import codeql.rust.elements.Pat
 import codeql.rust.elements.Path
 import codeql.rust.elements.PathExpr
 import codeql.rust.elements.PathPat
+import codeql.rust.elements.PrefixExpr
 import codeql.rust.elements.RangeExpr
 import codeql.rust.elements.RangePat
-import codeql.rust.elements.RecordFieldPat
-import codeql.rust.elements.RecordLitExpr
-import codeql.rust.elements.RecordLitField
+import codeql.rust.elements.RecordExpr
+import codeql.rust.elements.RecordExprField
 import codeql.rust.elements.RecordPat
+import codeql.rust.elements.RecordPatField
 import codeql.rust.elements.RefExpr
 import codeql.rust.elements.RefPat
 import codeql.rust.elements.RepeatExpr
@@ -71,14 +72,13 @@ import codeql.rust.elements.Stmt
 import codeql.rust.elements.TupleExpr
 import codeql.rust.elements.TuplePat
 import codeql.rust.elements.TupleStructPat
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.UnaryOpExpr
+import codeql.rust.elements.Type
 import codeql.rust.elements.UnderscoreExpr
 import codeql.rust.elements.Unimplemented
 import codeql.rust.elements.UnimplementedDeclaration
 import codeql.rust.elements.UnknownFile
 import codeql.rust.elements.UnknownLocation
 import codeql.rust.elements.UnsafeBlockExpr
-import codeql.rust.elements.WildPat
+import codeql.rust.elements.WildcardPat
 import codeql.rust.elements.YeetExpr
 import codeql.rust.elements.YieldExpr
--- a/rust/ql/lib/codeql/rust/elements/InlineAsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/InlineAsmExpr.qll
@@ -1,9 +1,9 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `InlineAsmExpr`.
+ * This module provides a hand-modifiable wrapper around the generated class `AsmExpr`.
 */

-private import codeql.rust.generated.InlineAsmExpr
+private import codeql.rust.generated.AsmExpr

 /**
 * An inline assembly expression. For example:
@@ -13,4 +13,4 @@ private import codeql.rust.generated.InlineAsmExpr
 * }
 * ```
 */
-class InlineAsmExpr extends Generated::InlineAsmExpr { }
+class AsmExpr extends Generated::AsmExpr { }
--- a/rust/ql/lib/codeql/rust/elements/AsmExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/AsmExprConstructor.qll
@@ -1,14 +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
- *  `TypeRef` synthesized instances.
+ *  `AsmExpr` synthesized instances.
 *  INTERNAL: Do not use.
 */

 private import codeql.rust.generated.Raw

 /**
- *  The characteristic predicate of `TypeRef` synthesized instances.
+ *  The characteristic predicate of `AsmExpr` synthesized instances.
 *  INTERNAL: Do not use.
 */
-predicate constructTypeRef(Raw::TypeRef id) { any() }
+predicate constructAsmExpr(Raw::AsmExpr id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/BinaryOpExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BinaryOpExpr.qll
@@ -1,9 +1,9 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `BinaryOpExpr`.
+ * This module provides a hand-modifiable wrapper around the generated class `BinExpr`.
 */

-private import codeql.rust.generated.BinaryOpExpr
+private import codeql.rust.generated.BinExpr

 /**
 * A binary operation expression. For example:
@@ -15,4 +15,4 @@ private import codeql.rust.generated.BinaryOpExpr
 * x += y;
 * ```
 */
-class BinaryOpExpr extends Generated::BinaryOpExpr { }
+class BinExpr extends Generated::BinExpr { }
--- a/rust/ql/lib/codeql/rust/elements/BinExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/BinExprConstructor.qll
@@ -1,14 +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
- *  `WildPat` synthesized instances.
+ *  `BinExpr` synthesized instances.
 *  INTERNAL: Do not use.
 */

 private import codeql.rust.generated.Raw

 /**
- *  The characteristic predicate of `WildPat` synthesized instances.
+ *  The characteristic predicate of `BinExpr` synthesized instances.
 *  INTERNAL: Do not use.
 */
-predicate constructWildPat(Raw::WildPat id) { any() }
+predicate constructBinExpr(Raw::BinExpr id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/GenericArgList.qll
+++ b/rust/ql/lib/codeql/rust/elements/GenericArgList.qll
@@ -1,9 +1,9 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `GenericArgs`.
+ * This module provides a hand-modifiable wrapper around the generated class `GenericArgList`.
 */

-private import codeql.rust.generated.GenericArgs
+private import codeql.rust.generated.GenericArgList

 /**
 * The base class for generic arguments.
@@ -11,4 +11,4 @@ private import codeql.rust.generated.GenericArgs
 * x.foo::<u32, u64>(42);
 * ```
 */
-class GenericArgs extends Generated::GenericArgs { }
+class GenericArgList extends Generated::GenericArgList { }
--- a/rust/ql/lib/codeql/rust/elements/GenericArgListConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/GenericArgListConstructor.qll
@@ -1,14 +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
- *  `RecordFieldPat` synthesized instances.
+ *  `GenericArgList` synthesized instances.
 *  INTERNAL: Do not use.
 */

 private import codeql.rust.generated.Raw

 /**
- *  The characteristic predicate of `RecordFieldPat` synthesized instances.
+ *  The characteristic predicate of `GenericArgList` synthesized instances.
 *  INTERNAL: Do not use.
 */
-predicate constructRecordFieldPat(Raw::RecordFieldPat id) { any() }
+predicate constructGenericArgList(Raw::GenericArgList id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/IdentPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/IdentPat.qll
@@ -1,9 +1,9 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `BindPat`.
+ * This module provides a hand-modifiable wrapper around the generated class `IdentPat`.
 */

-private import codeql.rust.generated.BindPat
+private import codeql.rust.generated.IdentPat

 /**
 * A binding pattern. For example:
@@ -20,4 +20,4 @@ private import codeql.rust.generated.BindPat
 * };
 * ```
 */
-class BindPat extends Generated::BindPat { }
+class IdentPat extends Generated::IdentPat { }
--- a/rust/ql/lib/codeql/rust/elements/IdentPatConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/IdentPatConstructor.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
+ *  `IdentPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.generated.Raw
+
+/**
+ *  The characteristic predicate of `IdentPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructIdentPat(Raw::IdentPat id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/InlineAsmExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/InlineAsmExprConstructor.qll
@@ -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
- *  `InlineAsmExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.generated.Raw
-
-/**
- *  The characteristic predicate of `InlineAsmExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructInlineAsmExpr(Raw::InlineAsmExpr id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/LiteralExpr.qll
@@ -1,9 +1,9 @@
 // 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`.
+ * This module provides a hand-modifiable wrapper around the generated class `Literal`.
 */

-private import codeql.rust.generated.LiteralExpr
+private import codeql.rust.generated.Literal

 /**
 * A literal expression. For example:
@@ -17,4 +17,4 @@ private import codeql.rust.generated.LiteralExpr
 * r"Hello, world!";
 * true;
 */
-class LiteralExpr extends Generated::LiteralExpr { }
+class Literal extends Generated::Literal { }
--- a/rust/ql/lib/codeql/rust/elements/LiteralConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/LiteralConstructor.qll
@@ -1,14 +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
- *  `BindPat` synthesized instances.
+ *  `Literal` synthesized instances.
 *  INTERNAL: Do not use.
 */

 private import codeql.rust.generated.Raw

 /**
- *  The characteristic predicate of `BindPat` synthesized instances.
+ *  The characteristic predicate of `Literal` synthesized instances.
 *  INTERNAL: Do not use.
 */
-predicate constructBindPat(Raw::BindPat id) { any() }
+predicate constructLiteral(Raw::Literal id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/LiteralExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/LiteralExprConstructor.qll
@@ -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.generated.Raw
-
-/**
- *  The characteristic predicate of `LiteralExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructLiteralExpr(Raw::LiteralExpr id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/LiteralPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/LiteralPat.qll
@@ -1,9 +1,9 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `LitPat`.
+ * This module provides a hand-modifiable wrapper around the generated class `LiteralPat`.
 */

-private import codeql.rust.generated.LitPat
+private import codeql.rust.generated.LiteralPat

 /**
 * A literal pattern. For example:
@@ -14,4 +14,4 @@ private import codeql.rust.generated.LitPat
 * }
 * ```
 */
-class LitPat extends Generated::LitPat { }
+class LiteralPat extends Generated::LiteralPat { }
--- a/rust/ql/lib/codeql/rust/elements/LiteralPatConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/LiteralPatConstructor.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
+ *  `LiteralPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.generated.Raw
+
+/**
+ *  The characteristic predicate of `LiteralPat` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructLiteralPat(Raw::LiteralPat id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/UnaryOpExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/UnaryOpExpr.qll
@@ -1,9 +1,9 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `UnaryOpExpr`.
+ * This module provides a hand-modifiable wrapper around the generated class `PrefixExpr`.
 */

-private import codeql.rust.generated.UnaryOpExpr
+private import codeql.rust.generated.PrefixExpr

 /**
 * A unary operation expression. For example:
@@ -13,4 +13,4 @@ private import codeql.rust.generated.UnaryOpExpr
 * let z = *ptr
 * ```
 */
-class UnaryOpExpr extends Generated::UnaryOpExpr { }
+class PrefixExpr extends Generated::PrefixExpr { }
--- a/rust/ql/lib/codeql/rust/elements/PrefixExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/PrefixExprConstructor.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
+ *  `PrefixExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.generated.Raw
+
+/**
+ *  The characteristic predicate of `PrefixExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructPrefixExpr(Raw::PrefixExpr id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/RecordLitExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordLitExpr.qll
@@ -1,12 +1,12 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `RecordLitExpr`.
+ * This module provides a hand-modifiable wrapper around the generated class `RecordExpr`.
 */

-private import codeql.rust.generated.RecordLitExpr
+private import codeql.rust.generated.RecordExpr

 /**
- * A record literal expression. For example:
+ * A record expression. For example:
 * ```
 * let first = Foo { a: 1, b: 2 };
 * let second = Foo { a: 2, ..first };
@@ -14,4 +14,4 @@ private import codeql.rust.generated.RecordLitExpr
 * Foo { .. } = second;
 * ```
 */
-class RecordLitExpr extends Generated::RecordLitExpr { }
+class RecordExpr extends Generated::RecordExpr { }
--- a/rust/ql/lib/codeql/rust/elements/RecordExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordExprConstructor.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
+ *  `RecordExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.generated.Raw
+
+/**
+ *  The characteristic predicate of `RecordExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructRecordExpr(Raw::RecordExpr id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/RecordExprField.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordExprField.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RecordExprField`.
+ */
+
+private import codeql.rust.generated.RecordExprField
+
+/**
+ * A field in a record expression. For example `a: 1` in:
+ * ```
+ * Foo { a: 1, b: 2 };
+ * ```
+ */
+class RecordExprField extends Generated::RecordExprField { }
--- a/rust/ql/lib/codeql/rust/elements/RecordExprFieldConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordExprFieldConstructor.qll
@@ -1,14 +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
- *  `BinaryOpExpr` synthesized instances.
+ *  `RecordExprField` synthesized instances.
 *  INTERNAL: Do not use.
 */

 private import codeql.rust.generated.Raw

 /**
- *  The characteristic predicate of `BinaryOpExpr` synthesized instances.
+ *  The characteristic predicate of `RecordExprField` synthesized instances.
 *  INTERNAL: Do not use.
 */
-predicate constructBinaryOpExpr(Raw::BinaryOpExpr id) { any() }
+predicate constructRecordExprField(Raw::RecordExprField id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/RecordLitExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordLitExprConstructor.qll
@@ -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
- *  `RecordLitExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.generated.Raw
-
-/**
- *  The characteristic predicate of `RecordLitExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRecordLitExpr(Raw::RecordLitExpr id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/RecordLitField.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordLitField.qll
@@ -1,14 +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 `RecordLitField`.
- */
-
-private import codeql.rust.generated.RecordLitField
-
-/**
- * A field in a record literal. For example `a: 1` in:
- * ```
- * Foo { a: 1, b: 2 };
- * ```
- */
-class RecordLitField extends Generated::RecordLitField { }
--- a/rust/ql/lib/codeql/rust/elements/RecordPatField.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordPatField.qll
@@ -1,9 +1,9 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `RecordFieldPat`.
+ * This module provides a hand-modifiable wrapper around the generated class `RecordPatField`.
 */

-private import codeql.rust.generated.RecordFieldPat
+private import codeql.rust.generated.RecordPatField

 /**
 * A field in a record pattern. For example `a: 1` in:
@@ -11,4 +11,4 @@ private import codeql.rust.generated.RecordFieldPat
 * let Foo { a: 1, b: 2 } = foo;
 * ```
 */
-class RecordFieldPat extends Generated::RecordFieldPat { }
+class RecordPatField extends Generated::RecordPatField { }
--- a/rust/ql/lib/codeql/rust/elements/RecordPatFieldConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordPatFieldConstructor.qll
@@ -1,14 +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
- *  `RecordLitField` synthesized instances.
+ *  `RecordPatField` synthesized instances.
 *  INTERNAL: Do not use.
 */

 private import codeql.rust.generated.Raw

 /**
- *  The characteristic predicate of `RecordLitField` synthesized instances.
+ *  The characteristic predicate of `RecordPatField` synthesized instances.
 *  INTERNAL: Do not use.
 */
-predicate constructRecordLitField(Raw::RecordLitField id) { any() }
+predicate constructRecordPatField(Raw::RecordPatField id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/TypeRef.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeRef.qll
@@ -1,9 +1,9 @@
 // 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`.
+ * This module provides a hand-modifiable wrapper around the generated class `Type`.
 */

-private import codeql.rust.generated.TypeRef
+private import codeql.rust.generated.Type

 /**
 * The base class for type references.
@@ -13,4 +13,4 @@ private import codeql.rust.generated.TypeRef
 * let z: Option<i32>;
 * ```
 */
-class TypeRef extends Generated::TypeRef { }
+class Type extends Generated::Type { }
--- a/rust/ql/lib/codeql/rust/elements/LitPatConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/LitPatConstructor.qll
@@ -1,14 +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
- *  `LitPat` synthesized instances.
+ *  `Type` synthesized instances.
 *  INTERNAL: Do not use.
 */

 private import codeql.rust.generated.Raw

 /**
- *  The characteristic predicate of `LitPat` synthesized instances.
+ *  The characteristic predicate of `Type` synthesized instances.
 *  INTERNAL: Do not use.
 */
-predicate constructLitPat(Raw::LitPat id) { any() }
+predicate constructType(Raw::Type id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/UnaryOpExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/UnaryOpExprConstructor.qll
@@ -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
- *  `UnaryOpExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.generated.Raw
-
-/**
- *  The characteristic predicate of `UnaryOpExpr` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructUnaryOpExpr(Raw::UnaryOpExpr id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/WildcardPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/WildcardPat.qll
@@ -1,9 +1,9 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `WildPat`.
+ * This module provides a hand-modifiable wrapper around the generated class `WildcardPat`.
 */

-private import codeql.rust.generated.WildPat
+private import codeql.rust.generated.WildcardPat

 /**
 * A wildcard pattern. For example:
@@ -11,4 +11,4 @@ private import codeql.rust.generated.WildPat
 * let _ = 42;
 * ```
 */
-class WildPat extends Generated::WildPat { }
+class WildcardPat extends Generated::WildcardPat { }
--- a/rust/ql/lib/codeql/rust/elements/WildcardPatConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/WildcardPatConstructor.qll
@@ -1,14 +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
- *  `GenericArgs` synthesized instances.
+ *  `WildcardPat` synthesized instances.
 *  INTERNAL: Do not use.
 */

 private import codeql.rust.generated.Raw

 /**
- *  The characteristic predicate of `GenericArgs` synthesized instances.
+ *  The characteristic predicate of `WildcardPat` synthesized instances.
 *  INTERNAL: Do not use.
 */
-predicate constructGenericArgs(Raw::GenericArgs id) { any() }
+predicate constructWildcardPat(Raw::WildcardPat id) { any() }
--- a/rust/ql/lib/codeql/rust/generated/AsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/AsmExpr.qll
@@ -0,0 +1,36 @@
+// generated by codegen
+/**
+ * This module provides the generated definition of `AsmExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.generated.Synth
+private import codeql.rust.generated.Raw
+import codeql.rust.elements.Expr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `AsmExpr` and should not
+ * be referenced directly.
+ */
+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.
+   */
+  class AsmExpr extends Synth::TAsmExpr, Expr {
+    override string getAPrimaryQlClass() { result = "AsmExpr" }
+
+    /**
+     * Gets the expression of this asm expression.
+     */
+    Expr getExpr() {
+      result = Synth::convertExprFromRaw(Synth::convertAsmExprToRaw(this).(Raw::AsmExpr).getExpr())
+    }
+  }
+}
--- a/rust/ql/lib/codeql/rust/generated/BinExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/BinExpr.qll
@@ -0,0 +1,55 @@
+// generated by codegen
+/**
+ * This module provides the generated definition of `BinExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.generated.Synth
+private import codeql.rust.generated.Raw
+import codeql.rust.elements.Expr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `BinExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A binary operation expression. For example:
+   * ```
+   * x + y;
+   * x && y;
+   * x <= y;
+   * x = y;
+   * x += y;
+   * ```
+   * INTERNAL: Do not reference the `Generated::BinExpr` class directly.
+   * Use the subclass `BinExpr`, where the following predicates are available.
+   */
+  class BinExpr extends Synth::TBinExpr, Expr {
+    override string getAPrimaryQlClass() { result = "BinExpr" }
+
+    /**
+     * Gets the lhs of this bin expression.
+     */
+    Expr getLhs() {
+      result = Synth::convertExprFromRaw(Synth::convertBinExprToRaw(this).(Raw::BinExpr).getLhs())
+    }
+
+    /**
+     * Gets the rhs of this bin expression.
+     */
+    Expr getRhs() {
+      result = Synth::convertExprFromRaw(Synth::convertBinExprToRaw(this).(Raw::BinExpr).getRhs())
+    }
+
+    /**
+     * Gets the op of this bin expression, if it exists.
+     */
+    string getOp() { result = Synth::convertBinExprToRaw(this).(Raw::BinExpr).getOp() }
+
+    /**
+     * Holds if `getOp()` exists.
+     */
+    final predicate hasOp() { exists(this.getOp()) }
+  }
+}
--- a/rust/ql/lib/codeql/rust/generated/BinaryOpExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/BinaryOpExpr.qll
@@ -1,57 +0,0 @@
-// generated by codegen
-/**
- * This module provides the generated definition of `BinaryOpExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.generated.Synth
-private import codeql.rust.generated.Raw
-import codeql.rust.elements.Expr
-
-/**
- * INTERNAL: This module contains the fully generated definition of `BinaryOpExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A binary operation expression. For example:
-   * ```
-   * x + y;
-   * x && y;
-   * x <= y;
-   * x = y;
-   * x += y;
-   * ```
-   * INTERNAL: Do not reference the `Generated::BinaryOpExpr` class directly.
-   * Use the subclass `BinaryOpExpr`, where the following predicates are available.
-   */
-  class BinaryOpExpr extends Synth::TBinaryOpExpr, Expr {
-    override string getAPrimaryQlClass() { result = "BinaryOpExpr" }
-
-    /**
-     * Gets the lhs of this binary op expression.
-     */
-    Expr getLhs() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertBinaryOpExprToRaw(this).(Raw::BinaryOpExpr).getLhs())
-    }
-
-    /**
-     * Gets the rhs of this binary op expression.
-     */
-    Expr getRhs() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertBinaryOpExprToRaw(this).(Raw::BinaryOpExpr).getRhs())
-    }
-
-    /**
-     * Gets the op of this binary op expression, if it exists.
-     */
-    string getOp() { result = Synth::convertBinaryOpExprToRaw(this).(Raw::BinaryOpExpr).getOp() }
-
-    /**
-     * Holds if `getOp()` exists.
-     */
-    final predicate hasOp() { exists(this.getOp()) }
-  }
-}
--- a/rust/ql/lib/codeql/rust/generated/CastExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/CastExpr.qll
@@ -7,7 +7,7 @@
 private import codeql.rust.generated.Synth
 private import codeql.rust.generated.Raw
 import codeql.rust.elements.Expr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Type

 /**
 * INTERNAL: This module contains the fully generated definition of `CastExpr` and should not
@@ -34,11 +34,11 @@ module Generated {
    }

    /**
-     * Gets the type reference of this cast expression.
+     * Gets the type of this cast expression.
     */
-    TypeRef getTypeRef() {
+    Type getType() {
      result =
-        Synth::convertTypeRefFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getTypeRef())
+        Synth::convertTypeFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getType())
    }
  }
 }
--- a/rust/ql/lib/codeql/rust/generated/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/ClosureExpr.qll
@@ -8,7 +8,7 @@ private import codeql.rust.generated.Synth
 private import codeql.rust.generated.Raw
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Pat
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Type

 /**
 * INTERNAL: This module contains the fully generated definition of `ClosureExpr` and should not
@@ -55,9 +55,9 @@ module Generated {
    /**
     * Gets the `index`th argument type of this closure expression (0-based), if it exists.
     */
-    TypeRef getArgType(int index) {
+    Type getArgType(int index) {
      result =
-        Synth::convertTypeRefFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertTypeFromRaw(Synth::convertClosureExprToRaw(this)
              .(Raw::ClosureExpr)
              .getArgType(index))
    }
@@ -70,14 +70,14 @@ module Generated {
    /**
     * Gets any of the argument types of this closure expression.
     */
-    final TypeRef getAnArgType() { result = this.getArgType(_) }
+    final Type getAnArgType() { result = this.getArgType(_) }

    /**
     * Gets the ret type of this closure expression, if it exists.
     */
-    TypeRef getRetType() {
+    Type getRetType() {
      result =
-        Synth::convertTypeRefFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertTypeFromRaw(Synth::convertClosureExprToRaw(this)
              .(Raw::ClosureExpr)
              .getRetType())
    }
--- a/rust/ql/lib/codeql/rust/generated/GenericArgList.qll
+++ b/rust/ql/lib/codeql/rust/generated/GenericArgList.qll
@@ -1,6 +1,6 @@
 // generated by codegen
 /**
- * This module provides the generated definition of `GenericArgs`.
+ * This module provides the generated definition of `GenericArgList`.
 * INTERNAL: Do not import directly.
 */

@@ -10,7 +10,7 @@ import codeql.rust.elements.AstNode
 import codeql.rust.elements.Unimplemented

 /**
- * INTERNAL: This module contains the fully generated definition of `GenericArgs` and should not
+ * INTERNAL: This module contains the fully generated definition of `GenericArgList` and should not
 * be referenced directly.
 */
 module Generated {
@@ -19,10 +19,10 @@ module Generated {
   * ```
   * x.foo::<u32, u64>(42);
   * ```
-   * INTERNAL: Do not reference the `Generated::GenericArgs` class directly.
-   * Use the subclass `GenericArgs`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::GenericArgList` class directly.
+   * Use the subclass `GenericArgList`, where the following predicates are available.
   */
-  class GenericArgs extends Synth::TGenericArgs, AstNode, Unimplemented {
-    override string getAPrimaryQlClass() { result = "GenericArgs" }
+  class GenericArgList extends Synth::TGenericArgList, AstNode, Unimplemented {
+    override string getAPrimaryQlClass() { result = "GenericArgList" }
  }
 }
--- a/rust/ql/lib/codeql/rust/generated/IdentPat.qll
+++ b/rust/ql/lib/codeql/rust/generated/IdentPat.qll
@@ -1,6 +1,6 @@
 // generated by codegen
 /**
- * This module provides the generated definition of `BindPat`.
+ * This module provides the generated definition of `IdentPat`.
 * INTERNAL: Do not import directly.
 */

@@ -9,7 +9,7 @@ private import codeql.rust.generated.Raw
 import codeql.rust.elements.Pat

 /**
- * INTERNAL: This module contains the fully generated definition of `BindPat` and should not
+ * INTERNAL: This module contains the fully generated definition of `IdentPat` and should not
 * be referenced directly.
 */
 module Generated {
@@ -27,24 +27,25 @@ module Generated {
   *     None => 0,
   * };
   * ```
-   * INTERNAL: Do not reference the `Generated::BindPat` class directly.
-   * Use the subclass `BindPat`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::IdentPat` class directly.
+   * Use the subclass `IdentPat`, where the following predicates are available.
   */
-  class BindPat extends Synth::TBindPat, Pat {
-    override string getAPrimaryQlClass() { result = "BindPat" }
+  class IdentPat extends Synth::TIdentPat, Pat {
+    override string getAPrimaryQlClass() { result = "IdentPat" }

    /**
-     * Gets the binding of this bind pat.
+     * Gets the binding of this ident pat.
     */
    string getBindingId() {
-      result = Synth::convertBindPatToRaw(this).(Raw::BindPat).getBindingId()
+      result = Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getBindingId()
    }

    /**
-     * Gets the subpat of this bind pat, if it exists.
+     * Gets the subpat of this ident pat, if it exists.
     */
    Pat getSubpat() {
-      result = Synth::convertPatFromRaw(Synth::convertBindPatToRaw(this).(Raw::BindPat).getSubpat())
+      result =
+        Synth::convertPatFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getSubpat())
    }

    /**
--- a/rust/ql/lib/codeql/rust/generated/InlineAsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/InlineAsmExpr.qll
@@ -1,39 +0,0 @@
-// generated by codegen
-/**
- * This module provides the generated definition of `InlineAsmExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.generated.Synth
-private import codeql.rust.generated.Raw
-import codeql.rust.elements.Expr
-
-/**
- * INTERNAL: This module contains the fully generated definition of `InlineAsmExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * An inline assembly expression. For example:
-   * ```
-   * unsafe {
-   *     builtin # asm(_);
-   * }
-   * ```
-   * INTERNAL: Do not reference the `Generated::InlineAsmExpr` class directly.
-   * Use the subclass `InlineAsmExpr`, where the following predicates are available.
-   */
-  class InlineAsmExpr extends Synth::TInlineAsmExpr, Expr {
-    override string getAPrimaryQlClass() { result = "InlineAsmExpr" }
-
-    /**
-     * Gets the expression of this inline asm expression.
-     */
-    Expr getExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertInlineAsmExprToRaw(this)
-              .(Raw::InlineAsmExpr)
-              .getExpr())
-    }
-  }
-}
--- a/rust/ql/lib/codeql/rust/generated/LetStmt.qll
+++ b/rust/ql/lib/codeql/rust/generated/LetStmt.qll
@@ -9,7 +9,7 @@ private import codeql.rust.generated.Raw
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Stmt
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Type

 /**
 * INTERNAL: This module contains the fully generated definition of `LetStmt` and should not
@@ -41,17 +41,16 @@ module Generated {
    }

    /**
-     * Gets the type reference of this let statement, if it exists.
+     * Gets the type of this let statement, if it exists.
     */
-    TypeRef getTypeRef() {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getTypeRef())
+    Type getType() {
+      result = Synth::convertTypeFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getType())
    }

    /**
-     * Holds if `getTypeRef()` exists.
+     * Holds if `getType()` exists.
     */
-    final predicate hasTypeRef() { exists(this.getTypeRef()) }
+    final predicate hasType() { exists(this.getType()) }

    /**
     * Gets the initializer of this let statement, if it exists.
--- a/rust/ql/lib/codeql/rust/generated/LitPat.qll
+++ b/rust/ql/lib/codeql/rust/generated/LitPat.qll
@@ -1,38 +0,0 @@
-// generated by codegen
-/**
- * This module provides the generated definition of `LitPat`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.generated.Synth
-private import codeql.rust.generated.Raw
-import codeql.rust.elements.Expr
-import codeql.rust.elements.Pat
-
-/**
- * INTERNAL: This module contains the fully generated definition of `LitPat` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A literal pattern. For example:
-   * ```
-   * match x {
-   *     42 => "ok",
-   *     _ => "fail",
-   * }
-   * ```
-   * INTERNAL: Do not reference the `Generated::LitPat` class directly.
-   * Use the subclass `LitPat`, where the following predicates are available.
-   */
-  class LitPat extends Synth::TLitPat, Pat {
-    override string getAPrimaryQlClass() { result = "LitPat" }
-
-    /**
-     * Gets the expression of this lit pat.
-     */
-    Expr getExpr() {
-      result = Synth::convertExprFromRaw(Synth::convertLitPatToRaw(this).(Raw::LitPat).getExpr())
-    }
-  }
-}
--- a/rust/ql/lib/codeql/rust/generated/LiteralExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/LiteralExpr.qll
@@ -1,6 +1,6 @@
 // generated by codegen
 /**
- * This module provides the generated definition of `LiteralExpr`.
+ * This module provides the generated definition of `Literal`.
 * INTERNAL: Do not import directly.
 */

@@ -9,7 +9,7 @@ private import codeql.rust.generated.Raw
 import codeql.rust.elements.Expr

 /**
- * INTERNAL: This module contains the fully generated definition of `LiteralExpr` and should not
+ * INTERNAL: This module contains the fully generated definition of `Literal` and should not
 * be referenced directly.
 */
 module Generated {
@@ -24,10 +24,10 @@ module Generated {
   * 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.
+   * INTERNAL: Do not reference the `Generated::Literal` class directly.
+   * Use the subclass `Literal`, where the following predicates are available.
   */
-  class LiteralExpr extends Synth::TLiteralExpr, Expr {
-    override string getAPrimaryQlClass() { result = "LiteralExpr" }
+  class Literal extends Synth::TLiteral, Expr {
+    override string getAPrimaryQlClass() { result = "Literal" }
  }
 }
--- a/rust/ql/lib/codeql/rust/generated/LiteralPat.qll
+++ b/rust/ql/lib/codeql/rust/generated/LiteralPat.qll
@@ -0,0 +1,39 @@
+// generated by codegen
+/**
+ * This module provides the generated definition of `LiteralPat`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.generated.Synth
+private import codeql.rust.generated.Raw
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Pat
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `LiteralPat` and should not
+ * be referenced directly.
+ */
+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.
+   */
+  class LiteralPat extends Synth::TLiteralPat, Pat {
+    override string getAPrimaryQlClass() { result = "LiteralPat" }
+
+    /**
+     * Gets the expression of this literal pat.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertLiteralPatToRaw(this).(Raw::LiteralPat).getExpr())
+    }
+  }
+}
--- a/rust/ql/lib/codeql/rust/generated/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/MethodCallExpr.qll
@@ -7,7 +7,7 @@
 private import codeql.rust.generated.Synth
 private import codeql.rust.generated.Raw
 import codeql.rust.elements.Expr
-import codeql.rust.elements.GenericArgs
+import codeql.rust.elements.GenericArgList

 /**
 * INTERNAL: This module contains the fully generated definition of `MethodCallExpr` and should not
@@ -65,9 +65,9 @@ module Generated {
    /**
     * Gets the generic arguments of this method call expression, if it exists.
     */
-    GenericArgs getGenericArgs() {
+    GenericArgList getGenericArgs() {
      result =
-        Synth::convertGenericArgsFromRaw(Synth::convertMethodCallExprToRaw(this)
+        Synth::convertGenericArgListFromRaw(Synth::convertMethodCallExprToRaw(this)
              .(Raw::MethodCallExpr)
              .getGenericArgs())
    }
--- a/rust/ql/lib/codeql/rust/generated/OffsetOfExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/OffsetOfExpr.qll
@@ -7,7 +7,7 @@
 private import codeql.rust.generated.Synth
 private import codeql.rust.generated.Raw
 import codeql.rust.elements.Expr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.Type

 /**
 * INTERNAL: This module contains the fully generated definition of `OffsetOfExpr` and should not
@@ -28,9 +28,9 @@ module Generated {
    /**
     * Gets the container of this offset of expression.
     */
-    TypeRef getContainer() {
+    Type getContainer() {
      result =
-        Synth::convertTypeRefFromRaw(Synth::convertOffsetOfExprToRaw(this)
+        Synth::convertTypeFromRaw(Synth::convertOffsetOfExprToRaw(this)
              .(Raw::OffsetOfExpr)
              .getContainer())
    }
--- a/rust/ql/lib/codeql/rust/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/generated/ParentChild.qll
@@ -161,8 +161,8 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfGenericArgs(
-    GenericArgs e, int index, string partialPredicateCall
+  private Element getImmediateChildOfGenericArgList(
+    GenericArgList e, int index, string partialPredicateCall
  ) {
    exists(int b, int bAstNode, int bUnimplemented, int n |
      b = 0 and
@@ -245,26 +245,8 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfRecordFieldPat(
-    RecordFieldPat e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bAstNode, int n, int nPat |
-      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
-      (
-        none()
-        or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfRecordLitField(
-    RecordLitField e, int index, string partialPredicateCall
+  private Element getImmediateChildOfRecordExprField(
+    RecordExprField e, int index, string partialPredicateCall
  ) {
    exists(int b, int bAstNode, int n, int nExpr |
      b = 0 and
@@ -281,6 +263,24 @@ private module Impl {
    )
  }

+  private Element getImmediateChildOfRecordPatField(
+    RecordPatField e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nPat |
+      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
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+      )
+    )
+  }
+
  private Element getImmediateChildOfStmt(Stmt e, int index, string partialPredicateCall) {
    exists(int b, int bAstNode, int n |
      b = 0 and
@@ -294,7 +294,7 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfTypeRef(TypeRef e, int index, string partialPredicateCall) {
+  private Element getImmediateChildOfType(Type e, int index, string partialPredicateCall) {
    exists(int b, int bAstNode, int bUnimplemented, int n |
      b = 0 and
      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
@@ -324,6 +324,22 @@ private module Impl {
    )
  }

+  private Element getImmediateChildOfAsmExpr(AsmExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nExpr |
+      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 |
      b = 0 and
@@ -356,9 +372,7 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfBinaryOpExpr(
-    BinaryOpExpr e, int index, string partialPredicateCall
-  ) {
+  private Element getImmediateChildOfBinExpr(BinExpr e, int index, string partialPredicateCall) {
    exists(int b, int bExpr, int n, int nLhs, int nRhs |
      b = 0 and
      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
@@ -377,22 +391,6 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfBindPat(BindPat e, int index, string partialPredicateCall) {
-    exists(int b, int bPat, int n, int nSubpat |
-      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
-      (
-        none()
-        or
-        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
-        or
-        index = n and result = e.getSubpat() and partialPredicateCall = "Subpat()"
-      )
-    )
-  }
-
  private Element getImmediateChildOfBlockExprBase(
    BlockExprBase e, int index, string partialPredicateCall
  ) {
@@ -487,12 +485,12 @@ private module Impl {
  }

  private Element getImmediateChildOfCastExpr(CastExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nExpr, int nTypeRef |
+    exists(int b, int bExpr, int n, int nExpr, int nType |
      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
-      nTypeRef = nExpr + 1 and
+      nType = nExpr + 1 and
      (
        none()
        or
@@ -500,7 +498,7 @@ private module Impl {
        or
        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
        or
-        index = nExpr and result = e.getTypeRef() and partialPredicateCall = "TypeRef()"
+        index = nExpr and result = e.getType() and partialPredicateCall = "Type()"
      )
    )
  }
@@ -635,6 +633,22 @@ private module Impl {
    )
  }

+  private Element getImmediateChildOfIdentPat(IdentPat e, int index, string partialPredicateCall) {
+    exists(int b, int bPat, int n, int nSubpat |
+      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
+      (
+        none()
+        or
+        result = getImmediateChildOfPat(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getSubpat() and partialPredicateCall = "Subpat()"
+      )
+    )
+  }
+
  private Element getImmediateChildOfIfExpr(IfExpr e, int index, string partialPredicateCall) {
    exists(int b, int bExpr, int n, int nCondition, int nThen, int nElse |
      b = 0 and
@@ -676,24 +690,6 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfInlineAsmExpr(
-    InlineAsmExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int n, int nExpr |
-      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 getImmediateChildOfItemStmt(ItemStmt e, int index, string partialPredicateCall) {
    exists(int b, int bStmt, int n |
      b = 0 and
@@ -727,13 +723,13 @@ private module Impl {
  }

  private Element getImmediateChildOfLetStmt(LetStmt e, int index, string partialPredicateCall) {
-    exists(int b, int bStmt, int n, int nPat, int nTypeRef, int nInitializer, int nElse |
+    exists(int b, int bStmt, int n, int nPat, int nType, int nInitializer, int nElse |
      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
-      nTypeRef = nPat + 1 and
-      nInitializer = nTypeRef + 1 and
+      nType = nPat + 1 and
+      nInitializer = nType + 1 and
      nElse = nInitializer + 1 and
      (
        none()
@@ -742,16 +738,29 @@ private module Impl {
        or
        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
        or
-        index = nPat and result = e.getTypeRef() and partialPredicateCall = "TypeRef()"
+        index = nPat and result = e.getType() and partialPredicateCall = "Type()"
        or
-        index = nTypeRef and result = e.getInitializer() and partialPredicateCall = "Initializer()"
+        index = nType and result = e.getInitializer() and partialPredicateCall = "Initializer()"
        or
        index = nInitializer and result = e.getElse() and partialPredicateCall = "Else()"
      )
    )
  }

-  private Element getImmediateChildOfLitPat(LitPat e, int index, string partialPredicateCall) {
+  private Element getImmediateChildOfLiteral(Literal 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 getImmediateChildOfLiteralPat(LiteralPat e, int index, string partialPredicateCall) {
    exists(int b, int bPat, int n, int nExpr |
      b = 0 and
      bPat = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfPat(e, i, _)) | i) and
@@ -767,21 +776,6 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfLiteralExpr(
-    LiteralExpr 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 getImmediateChildOfLoopExpr(LoopExpr e, int index, string partialPredicateCall) {
    exists(int b, int bExpr, int n, int nBody, int nLabel |
      b = 0 and
@@ -959,6 +953,22 @@ private module Impl {
    )
  }

+  private Element getImmediateChildOfPrefixExpr(PrefixExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nExpr |
+      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 |
      b = 0 and
@@ -997,9 +1007,7 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfRecordLitExpr(
-    RecordLitExpr e, int index, string partialPredicateCall
-  ) {
+  private Element getImmediateChildOfRecordExpr(RecordExpr e, int index, string partialPredicateCall) {
    exists(int b, int bExpr, int n, int nPath, int nField, int nSpread |
      b = 0 and
      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
@@ -1170,24 +1178,6 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfUnaryOpExpr(
-    UnaryOpExpr e, int index, string partialPredicateCall
-  ) {
-    exists(int b, int bExpr, int n, int nExpr |
-      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 getImmediateChildOfUnderscoreExpr(
    UnderscoreExpr e, int index, string partialPredicateCall
  ) {
@@ -1224,7 +1214,9 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfWildPat(WildPat e, int index, string partialPredicateCall) {
+  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
@@ -1370,7 +1362,7 @@ private module Impl {
    or
    result = getImmediateChildOfUnknownLocation(e, index, partialAccessor)
    or
-    result = getImmediateChildOfGenericArgs(e, index, partialAccessor)
+    result = getImmediateChildOfGenericArgList(e, index, partialAccessor)
    or
    result = getImmediateChildOfLabel(e, index, partialAccessor)
    or
@@ -1378,19 +1370,19 @@ private module Impl {
    or
    result = getImmediateChildOfPath(e, index, partialAccessor)
    or
-    result = getImmediateChildOfRecordFieldPat(e, index, partialAccessor)
+    result = getImmediateChildOfRecordExprField(e, index, partialAccessor)
    or
-    result = getImmediateChildOfRecordLitField(e, index, partialAccessor)
+    result = getImmediateChildOfRecordPatField(e, index, partialAccessor)
    or
-    result = getImmediateChildOfTypeRef(e, index, partialAccessor)
+    result = getImmediateChildOfType(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfAsmExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfAwaitExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfBecomeExpr(e, index, partialAccessor)
    or
-    result = getImmediateChildOfBinaryOpExpr(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfBindPat(e, index, partialAccessor)
+    result = getImmediateChildOfBinExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfBoxExpr(e, index, partialAccessor)
    or
@@ -1416,21 +1408,21 @@ private module Impl {
    or
    result = getImmediateChildOfFunction(e, index, partialAccessor)
    or
+    result = getImmediateChildOfIdentPat(e, index, partialAccessor)
+    or
    result = getImmediateChildOfIfExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfIndexExpr(e, index, partialAccessor)
    or
-    result = getImmediateChildOfInlineAsmExpr(e, index, partialAccessor)
-    or
    result = getImmediateChildOfItemStmt(e, index, partialAccessor)
    or
    result = getImmediateChildOfLetExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfLetStmt(e, index, partialAccessor)
    or
-    result = getImmediateChildOfLitPat(e, index, partialAccessor)
+    result = getImmediateChildOfLiteral(e, index, partialAccessor)
    or
-    result = getImmediateChildOfLiteralExpr(e, index, partialAccessor)
+    result = getImmediateChildOfLiteralPat(e, index, partialAccessor)
    or
    result = getImmediateChildOfLoopExpr(e, index, partialAccessor)
    or
@@ -1452,11 +1444,13 @@ private module Impl {
    or
    result = getImmediateChildOfPathPat(e, index, partialAccessor)
    or
+    result = getImmediateChildOfPrefixExpr(e, index, partialAccessor)
+    or
    result = getImmediateChildOfRangeExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfRangePat(e, index, partialAccessor)
    or
-    result = getImmediateChildOfRecordLitExpr(e, index, partialAccessor)
+    result = getImmediateChildOfRecordExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfRecordPat(e, index, partialAccessor)
    or
@@ -1474,13 +1468,11 @@ private module Impl {
    or
    result = getImmediateChildOfTupleStructPat(e, index, partialAccessor)
    or
-    result = getImmediateChildOfUnaryOpExpr(e, index, partialAccessor)
-    or
    result = getImmediateChildOfUnderscoreExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfUnimplementedDeclaration(e, index, partialAccessor)
    or
-    result = getImmediateChildOfWildPat(e, index, partialAccessor)
+    result = getImmediateChildOfWildcardPat(e, index, partialAccessor)
    or
    result = getImmediateChildOfYeetExpr(e, index, partialAccessor)
    or
--- a/rust/ql/lib/codeql/rust/generated/PrefixExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/PrefixExpr.qll
@@ -0,0 +1,42 @@
+// generated by codegen
+/**
+ * This module provides the generated definition of `PrefixExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.generated.Synth
+private import codeql.rust.generated.Raw
+import codeql.rust.elements.Expr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PrefixExpr` and should not
+ * be referenced directly.
+ */
+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.
+   */
+  class PrefixExpr extends Synth::TPrefixExpr, Expr {
+    override string getAPrimaryQlClass() { result = "PrefixExpr" }
+
+    /**
+     * Gets the expression of this prefix expression.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertPrefixExprToRaw(this).(Raw::PrefixExpr).getExpr())
+    }
+
+    /**
+     * Gets the op of this prefix expression.
+     */
+    string getOp() { result = Synth::convertPrefixExprToRaw(this).(Raw::PrefixExpr).getOp() }
+  }
+}
--- a/rust/ql/lib/codeql/rust/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/generated/Raw.qll
@@ -102,8 +102,8 @@ module Raw {
   * x.foo::<u32, u64>(42);
   * ```
   */
-  class GenericArgs extends @generic_args, AstNode, Unimplemented {
-    override string toString() { result = "GenericArgs" }
+  class GenericArgList extends @generic_arg_list, AstNode, Unimplemented {
+    override string toString() { result = "GenericArgList" }
  }

  /**
@@ -177,6 +177,27 @@ module Raw {
    override string toString() { result = "Path" }
  }

+  /**
+   * 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" }
+
+    /**
+     * Gets the name of this record expression field.
+     */
+    string getName() { record_expr_fields(this, result, _) }
+
+    /**
+     * Gets the expression of this record expression field.
+     */
+    Expr getExpr() { record_expr_fields(this, _, result) }
+  }
+
  /**
   * INTERNAL: Do not use.
   * A field in a record pattern. For example `a: 1` in:
@@ -184,39 +205,18 @@ module Raw {
   * let Foo { a: 1, b: 2 } = foo;
   * ```
   */
-  class RecordFieldPat extends @record_field_pat, AstNode {
-    override string toString() { result = "RecordFieldPat" }
+  class RecordPatField extends @record_pat_field, AstNode {
+    override string toString() { result = "RecordPatField" }

    /**
-     * Gets the name of this record field pat.
+     * Gets the name of this record pat field.
     */
-    string getName() { record_field_pats(this, result, _) }
+    string getName() { record_pat_fields(this, result, _) }

    /**
-     * Gets the pat of this record field pat.
+     * Gets the pat of this record pat field.
     */
-    Pat getPat() { record_field_pats(this, _, result) }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A field in a record literal. For example `a: 1` in:
-   * ```
-   * Foo { a: 1, b: 2 };
-   * ```
-   */
-  class RecordLitField extends @record_lit_field, AstNode {
-    override string toString() { result = "RecordLitField" }
-
-    /**
-     * Gets the name of this record lit field.
-     */
-    string getName() { record_lit_fields(this, result, _) }
-
-    /**
-     * Gets the expression of this record lit field.
-     */
-    Expr getExpr() { record_lit_fields(this, _, result) }
+    Pat getPat() { record_pat_fields(this, _, result) }
  }

  /**
@@ -234,8 +234,8 @@ module Raw {
   * let z: Option<i32>;
   * ```
   */
-  class TypeRef extends @type_ref, AstNode, Unimplemented {
-    override string toString() { result = "TypeRef" }
+  class Type extends @type, AstNode, Unimplemented {
+    override string toString() { result = "Type" }
  }

  /**
@@ -248,6 +248,24 @@ module Raw {
   */
  class ArrayExpr extends @array_expr, Expr { }

+  /**
+   * INTERNAL: Do not use.
+   * An inline assembly expression. For example:
+   * ```
+   * unsafe {
+   *     builtin # asm(_);
+   * }
+   * ```
+   */
+  class AsmExpr extends @asm_expr, Expr {
+    override string toString() { result = "AsmExpr" }
+
+    /**
+     * Gets the expression of this asm expression.
+     */
+    Expr getExpr() { asm_exprs(this, result) }
+  }
+
  /**
   * INTERNAL: Do not use.
   * An `await` expression. For example:
@@ -299,53 +317,23 @@ module Raw {
   * x += y;
   * ```
   */
-  class BinaryOpExpr extends @binary_op_expr, Expr {
-    override string toString() { result = "BinaryOpExpr" }
+  class BinExpr extends @bin_expr, Expr {
+    override string toString() { result = "BinExpr" }

    /**
-     * Gets the lhs of this binary op expression.
+     * Gets the lhs of this bin expression.
     */
-    Expr getLhs() { binary_op_exprs(this, result, _) }
+    Expr getLhs() { bin_exprs(this, result, _) }

    /**
-     * Gets the rhs of this binary op expression.
+     * Gets the rhs of this bin expression.
     */
-    Expr getRhs() { binary_op_exprs(this, _, result) }
+    Expr getRhs() { bin_exprs(this, _, result) }

    /**
-     * Gets the op of this binary op expression, if it exists.
+     * Gets the op of this bin expression, if it exists.
     */
-    string getOp() { binary_op_expr_ops(this, result) }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A binding pattern. For example:
-   * ```
-   * match x {
-   *     Some(y) => y,
-   *     None => 0,
-   * };
-   * ```
-   * ```
-   * match x {
-   *     y@Some(_) => y,
-   *     None => 0,
-   * };
-   * ```
-   */
-  class BindPat extends @bind_pat, Pat {
-    override string toString() { result = "BindPat" }
-
-    /**
-     * Gets the binding of this bind pat.
-     */
-    string getBindingId() { bind_pats(this, result) }
-
-    /**
-     * Gets the subpat of this bind pat, if it exists.
-     */
-    Pat getSubpat() { bind_pat_subpats(this, result) }
+    string getOp() { bin_expr_ops(this, result) }
  }

  /**
@@ -475,9 +463,9 @@ module Raw {
    Expr getExpr() { cast_exprs(this, result, _) }

    /**
-     * Gets the type reference of this cast expression.
+     * Gets the type of this cast expression.
     */
-    TypeRef getTypeRef() { cast_exprs(this, _, result) }
+    Type getType() { cast_exprs(this, _, result) }
  }

  /**
@@ -504,12 +492,12 @@ module Raw {
    /**
     * Gets the `index`th argument type of this closure expression (0-based), if it exists.
     */
-    TypeRef getArgType(int index) { closure_expr_arg_types(this, index, result) }
+    Type getArgType(int index) { closure_expr_arg_types(this, index, result) }

    /**
     * Gets the ret type of this closure expression, if it exists.
     */
-    TypeRef getRetType() { closure_expr_ret_types(this, result) }
+    Type getRetType() { closure_expr_ret_types(this, result) }

    /**
     * Gets the body of this closure expression.
@@ -662,6 +650,36 @@ module Raw {
    Expr getBody() { functions(this, _, result) }
  }

+  /**
+   * INTERNAL: Do not use.
+   * A binding pattern. For example:
+   * ```
+   * match x {
+   *     Some(y) => y,
+   *     None => 0,
+   * };
+   * ```
+   * ```
+   * match x {
+   *     y@Some(_) => y,
+   *     None => 0,
+   * };
+   * ```
+   */
+  class IdentPat extends @ident_pat, Pat {
+    override string toString() { result = "IdentPat" }
+
+    /**
+     * Gets the binding of this ident pat.
+     */
+    string getBindingId() { ident_pats(this, result) }
+
+    /**
+     * Gets the subpat of this ident pat, if it exists.
+     */
+    Pat getSubpat() { ident_pat_subpats(this, result) }
+  }
+
  /**
   * INTERNAL: Do not use.
   * An `if` expression. For example:
@@ -724,24 +742,6 @@ module Raw {
    predicate isAssigneeExpr() { index_expr_is_assignee_expr(this) }
  }

-  /**
-   * INTERNAL: Do not use.
-   * An inline assembly expression. For example:
-   * ```
-   * unsafe {
-   *     builtin # asm(_);
-   * }
-   * ```
-   */
-  class InlineAsmExpr extends @inline_asm_expr, Expr {
-    override string toString() { result = "InlineAsmExpr" }
-
-    /**
-     * Gets the expression of this inline asm expression.
-     */
-    Expr getExpr() { inline_asm_exprs(this, result) }
-  }
-
  /**
   * INTERNAL: Do not use.
   * An item statement. For example:
@@ -801,9 +801,9 @@ module Raw {
    Pat getPat() { let_stmts(this, result) }

    /**
-     * Gets the type reference of this let statement, if it exists.
+     * Gets the type of this let statement, if it exists.
     */
-    TypeRef getTypeRef() { let_stmt_type_refs(this, result) }
+    Type getType() { let_stmt_types(this, result) }

    /**
     * Gets the initializer of this let statement, if it exists.
@@ -816,25 +816,6 @@ module Raw {
    Expr getElse() { let_stmt_elses(this, result) }
  }

-  /**
-   * INTERNAL: Do not use.
-   * A literal pattern. For example:
-   * ```
-   * match x {
-   *     42 => "ok",
-   *     _ => "fail",
-   * }
-   * ```
-   */
-  class LitPat extends @lit_pat, Pat {
-    override string toString() { result = "LitPat" }
-
-    /**
-     * Gets the expression of this lit pat.
-     */
-    Expr getExpr() { lit_pats(this, result) }
-  }
-
  /**
   * INTERNAL: Do not use.
   * A literal expression. For example:
@@ -848,8 +829,27 @@ module Raw {
   * r"Hello, world!";
   * true;
   */
-  class LiteralExpr extends @literal_expr, Expr {
-    override string toString() { result = "LiteralExpr" }
+  class Literal extends @literal, Expr {
+    override string toString() { result = "Literal" }
+  }
+
+  /**
+   * 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 expression of this literal pat.
+     */
+    Expr getExpr() { literal_pats(this, result) }
  }

  /**
@@ -949,7 +949,7 @@ module Raw {
    /**
     * Gets the generic arguments of this method call expression, if it exists.
     */
-    GenericArgs getGenericArgs() { method_call_expr_generic_args(this, result) }
+    GenericArgList getGenericArgs() { method_call_expr_generic_args(this, result) }
  }

  /**
@@ -1012,7 +1012,7 @@ module Raw {
    /**
     * Gets the container of this offset of expression.
     */
-    TypeRef getContainer() { offset_of_exprs(this, result) }
+    Type getContainer() { offset_of_exprs(this, result) }

    /**
     * Gets the `index`th field of this offset of expression (0-based).
@@ -1076,6 +1076,29 @@ module Raw {
    Path getPath() { path_pats(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, _) }
+
+    /**
+     * Gets the op of this prefix expression.
+     */
+    string getOp() { prefix_exprs(this, _, result) }
+  }
+
  /**
   * INTERNAL: Do not use.
   * A range expression. For example:
@@ -1134,7 +1157,7 @@ module Raw {

  /**
   * INTERNAL: Do not use.
-   * A record literal expression. For example:
+   * A record expression. For example:
   * ```
   * let first = Foo { a: 1, b: 2 };
   * let second = Foo { a: 2, ..first };
@@ -1142,33 +1165,33 @@ module Raw {
   * Foo { .. } = second;
   * ```
   */
-  class RecordLitExpr extends @record_lit_expr, Expr {
-    override string toString() { result = "RecordLitExpr" }
+  class RecordExpr extends @record_expr, Expr {
+    override string toString() { result = "RecordExpr" }

    /**
-     * Gets the path of this record lit expression, if it exists.
+     * Gets the path of this record expression, if it exists.
     */
-    Path getPath() { record_lit_expr_paths(this, result) }
+    Path getPath() { record_expr_paths(this, result) }

    /**
-     * Gets the `index`th field of this record lit expression (0-based).
+     * Gets the `index`th field of this record expression (0-based).
     */
-    RecordLitField getField(int index) { record_lit_expr_fields(this, index, result) }
+    RecordExprField getField(int index) { record_expr_fields(this, index, result) }

    /**
-     * Gets the spread of this record lit expression, if it exists.
+     * Gets the spread of this record expression, if it exists.
     */
-    Expr getSpread() { record_lit_expr_spreads(this, result) }
+    Expr getSpread() { record_expr_spreads(this, result) }

    /**
-     * Holds if this record lit expression has ellipsis.
+     * Holds if this record expression has ellipsis.
     */
-    predicate hasEllipsis() { record_lit_expr_has_ellipsis(this) }
+    predicate hasEllipsis() { record_expr_has_ellipsis(this) }

    /**
-     * Holds if this record lit expression is assignee expression.
+     * Holds if this record expression is assignee expression.
     */
-    predicate isAssigneeExpr() { record_lit_expr_is_assignee_expr(this) }
+    predicate isAssigneeExpr() { record_expr_is_assignee_expr(this) }
  }

  /**
@@ -1192,7 +1215,7 @@ module Raw {
    /**
     * Gets the `index`th argument of this record pat (0-based).
     */
-    RecordFieldPat getArg(int index) { record_pat_args(this, index, result) }
+    RecordPatField getArg(int index) { record_pat_args(this, index, result) }

    /**
     * Holds if this record pat has ellipsis.
@@ -1379,29 +1402,6 @@ module Raw {
    int getEllipsisIndex() { tuple_struct_pat_ellipsis_indices(this, result) }
  }

-  /**
-   * INTERNAL: Do not use.
-   * A unary operation expression. For example:
-   * ```
-   * let x = -42
-   * let y = !true
-   * let z = *ptr
-   * ```
-   */
-  class UnaryOpExpr extends @unary_op_expr, Expr {
-    override string toString() { result = "UnaryOpExpr" }
-
-    /**
-     * Gets the expression of this unary op expression.
-     */
-    Expr getExpr() { unary_op_exprs(this, result, _) }
-
-    /**
-     * Gets the op of this unary op expression.
-     */
-    string getOp() { unary_op_exprs(this, _, result) }
-  }
-
  /**
   * INTERNAL: Do not use.
   * An underscore expression. For example:
@@ -1427,8 +1427,8 @@ module Raw {
   * let _ = 42;
   * ```
   */
-  class WildPat extends @wild_pat, Pat {
-    override string toString() { result = "WildPat" }
+  class WildcardPat extends @wildcard_pat, Pat {
+    override string toString() { result = "WildcardPat" }
  }

  /**
--- a/rust/ql/lib/codeql/rust/generated/RecordExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/RecordExpr.qll
@@ -0,0 +1,90 @@
+// generated by codegen
+/**
+ * This module provides the generated definition of `RecordExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.generated.Synth
+private import codeql.rust.generated.Raw
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Path
+import codeql.rust.elements.RecordExprField
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RecordExpr` and should not
+ * be referenced directly.
+ */
+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.
+   */
+  class RecordExpr extends Synth::TRecordExpr, Expr {
+    override string getAPrimaryQlClass() { result = "RecordExpr" }
+
+    /**
+     * Gets the path of this record expression, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertRecordExprToRaw(this).(Raw::RecordExpr).getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+
+    /**
+     * Gets the `index`th field of this record expression (0-based).
+     */
+    RecordExprField getField(int index) {
+      result =
+        Synth::convertRecordExprFieldFromRaw(Synth::convertRecordExprToRaw(this)
+              .(Raw::RecordExpr)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this record expression.
+     */
+    final RecordExprField getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this record expression.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(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()
+    }
+  }
+}
--- a/rust/ql/lib/codeql/rust/generated/RecordExprField.qll
+++ b/rust/ql/lib/codeql/rust/generated/RecordExprField.qll
@@ -0,0 +1,45 @@
+// generated by codegen
+/**
+ * This module provides the generated definition of `RecordExprField`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.generated.Synth
+private import codeql.rust.generated.Raw
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Expr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RecordExprField` and should not
+ * be referenced directly.
+ */
+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.
+   */
+  class RecordExprField extends Synth::TRecordExprField, AstNode {
+    override string getAPrimaryQlClass() { result = "RecordExprField" }
+
+    /**
+     * Gets the name of this record expression field.
+     */
+    string getName() {
+      result = Synth::convertRecordExprFieldToRaw(this).(Raw::RecordExprField).getName()
+    }
+
+    /**
+     * Gets the expression of this record expression field.
+     */
+    Expr getExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertRecordExprFieldToRaw(this)
+              .(Raw::RecordExprField)
+              .getExpr())
+    }
+  }
+}
--- a/rust/ql/lib/codeql/rust/generated/RecordFieldPat.qll
+++ b/rust/ql/lib/codeql/rust/generated/RecordFieldPat.qll
@@ -1,45 +0,0 @@
-// generated by codegen
-/**
- * This module provides the generated definition of `RecordFieldPat`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.generated.Synth
-private import codeql.rust.generated.Raw
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.Pat
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RecordFieldPat` and should not
- * be referenced directly.
- */
-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::RecordFieldPat` class directly.
-   * Use the subclass `RecordFieldPat`, where the following predicates are available.
-   */
-  class RecordFieldPat extends Synth::TRecordFieldPat, AstNode {
-    override string getAPrimaryQlClass() { result = "RecordFieldPat" }
-
-    /**
-     * Gets the name of this record field pat.
-     */
-    string getName() {
-      result = Synth::convertRecordFieldPatToRaw(this).(Raw::RecordFieldPat).getName()
-    }
-
-    /**
-     * Gets the pat of this record field pat.
-     */
-    Pat getPat() {
-      result =
-        Synth::convertPatFromRaw(Synth::convertRecordFieldPatToRaw(this)
-              .(Raw::RecordFieldPat)
-              .getPat())
-    }
-  }
-}
--- a/rust/ql/lib/codeql/rust/generated/RecordLitExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/RecordLitExpr.qll
@@ -1,96 +0,0 @@
-// generated by codegen
-/**
- * This module provides the generated definition of `RecordLitExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.generated.Synth
-private import codeql.rust.generated.Raw
-import codeql.rust.elements.Expr
-import codeql.rust.elements.Path
-import codeql.rust.elements.RecordLitField
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RecordLitExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A record literal 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::RecordLitExpr` class directly.
-   * Use the subclass `RecordLitExpr`, where the following predicates are available.
-   */
-  class RecordLitExpr extends Synth::TRecordLitExpr, Expr {
-    override string getAPrimaryQlClass() { result = "RecordLitExpr" }
-
-    /**
-     * Gets the path of this record lit expression, if it exists.
-     */
-    Path getPath() {
-      result =
-        Synth::convertPathFromRaw(Synth::convertRecordLitExprToRaw(this)
-              .(Raw::RecordLitExpr)
-              .getPath())
-    }
-
-    /**
-     * Holds if `getPath()` exists.
-     */
-    final predicate hasPath() { exists(this.getPath()) }
-
-    /**
-     * Gets the `index`th field of this record lit expression (0-based).
-     */
-    RecordLitField getField(int index) {
-      result =
-        Synth::convertRecordLitFieldFromRaw(Synth::convertRecordLitExprToRaw(this)
-              .(Raw::RecordLitExpr)
-              .getField(index))
-    }
-
-    /**
-     * Gets any of the fields of this record lit expression.
-     */
-    final RecordLitField getAField() { result = this.getField(_) }
-
-    /**
-     * Gets the number of fields of this record lit expression.
-     */
-    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
-
-    /**
-     * Gets the spread of this record lit expression, if it exists.
-     */
-    Expr getSpread() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertRecordLitExprToRaw(this)
-              .(Raw::RecordLitExpr)
-              .getSpread())
-    }
-
-    /**
-     * Holds if `getSpread()` exists.
-     */
-    final predicate hasSpread() { exists(this.getSpread()) }
-
-    /**
-     * Holds if this record lit expression has ellipsis.
-     */
-    predicate hasEllipsis() {
-      Synth::convertRecordLitExprToRaw(this).(Raw::RecordLitExpr).hasEllipsis()
-    }
-
-    /**
-     * Holds if this record lit expression is assignee expression.
-     */
-    predicate isAssigneeExpr() {
-      Synth::convertRecordLitExprToRaw(this).(Raw::RecordLitExpr).isAssigneeExpr()
-    }
-  }
-}
--- a/rust/ql/lib/codeql/rust/generated/RecordLitField.qll
+++ b/rust/ql/lib/codeql/rust/generated/RecordLitField.qll
@@ -1,45 +0,0 @@
-// generated by codegen
-/**
- * This module provides the generated definition of `RecordLitField`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.generated.Synth
-private import codeql.rust.generated.Raw
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.Expr
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RecordLitField` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A field in a record literal. For example `a: 1` in:
-   * ```
-   * Foo { a: 1, b: 2 };
-   * ```
-   * INTERNAL: Do not reference the `Generated::RecordLitField` class directly.
-   * Use the subclass `RecordLitField`, where the following predicates are available.
-   */
-  class RecordLitField extends Synth::TRecordLitField, AstNode {
-    override string getAPrimaryQlClass() { result = "RecordLitField" }
-
-    /**
-     * Gets the name of this record lit field.
-     */
-    string getName() {
-      result = Synth::convertRecordLitFieldToRaw(this).(Raw::RecordLitField).getName()
-    }
-
-    /**
-     * Gets the expression of this record lit field.
-     */
-    Expr getExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertRecordLitFieldToRaw(this)
-              .(Raw::RecordLitField)
-              .getExpr())
-    }
-  }
-}
--- a/rust/ql/lib/codeql/rust/generated/RecordPat.qll
+++ b/rust/ql/lib/codeql/rust/generated/RecordPat.qll
@@ -8,7 +8,7 @@ private import codeql.rust.generated.Synth
 private import codeql.rust.generated.Raw
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Path
-import codeql.rust.elements.RecordFieldPat
+import codeql.rust.elements.RecordPatField

 /**
 * INTERNAL: This module contains the fully generated definition of `RecordPat` and should not
@@ -45,9 +45,9 @@ module Generated {
    /**
     * Gets the `index`th argument of this record pat (0-based).
     */
-    RecordFieldPat getArg(int index) {
+    RecordPatField getArg(int index) {
      result =
-        Synth::convertRecordFieldPatFromRaw(Synth::convertRecordPatToRaw(this)
+        Synth::convertRecordPatFieldFromRaw(Synth::convertRecordPatToRaw(this)
              .(Raw::RecordPat)
              .getArg(index))
    }
@@ -55,7 +55,7 @@ module Generated {
    /**
     * Gets any of the arguments of this record pat.
     */
-    final RecordFieldPat getAnArg() { result = this.getArg(_) }
+    final RecordPatField getAnArg() { result = this.getArg(_) }

    /**
     * Gets the number of arguments of this record pat.
--- a/rust/ql/lib/codeql/rust/generated/RecordPatField.qll
+++ b/rust/ql/lib/codeql/rust/generated/RecordPatField.qll
@@ -0,0 +1,45 @@
+// generated by codegen
+/**
+ * This module provides the generated definition of `RecordPatField`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.generated.Synth
+private import codeql.rust.generated.Raw
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Pat
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RecordPatField` and should not
+ * be referenced directly.
+ */
+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.
+   */
+  class RecordPatField extends Synth::TRecordPatField, AstNode {
+    override string getAPrimaryQlClass() { result = "RecordPatField" }
+
+    /**
+     * Gets the name of this record pat field.
+     */
+    string getName() {
+      result = Synth::convertRecordPatFieldToRaw(this).(Raw::RecordPatField).getName()
+    }
+
+    /**
+     * Gets the pat of this record pat field.
+     */
+    Pat getPat() {
+      result =
+        Synth::convertPatFromRaw(Synth::convertRecordPatFieldToRaw(this)
+              .(Raw::RecordPatField)
+              .getPat())
+    }
+  }
+}
--- a/rust/ql/lib/codeql/rust/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/generated/Synth.qll
@@ -15,6 +15,10 @@ module Synth {
   */
  cached
  newtype TElement =
+    /**
+     * INTERNAL: Do not use.
+     */
+    TAsmExpr(Raw::AsmExpr id) { constructAsmExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -30,11 +34,7 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TBinaryOpExpr(Raw::BinaryOpExpr id) { constructBinaryOpExpr(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TBindPat(Raw::BindPat id) { constructBindPat(id) } or
+    TBinExpr(Raw::BinExpr id) { constructBinExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -102,7 +102,11 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TGenericArgs(Raw::GenericArgs id) { constructGenericArgs(id) } or
+    TGenericArgList(Raw::GenericArgList id) { constructGenericArgList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TIdentPat(Raw::IdentPat id) { constructIdentPat(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -111,10 +115,6 @@ module Synth {
     * INTERNAL: Do not use.
     */
    TIndexExpr(Raw::IndexExpr id) { constructIndexExpr(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TInlineAsmExpr(Raw::InlineAsmExpr id) { constructInlineAsmExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -134,11 +134,11 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TLitPat(Raw::LitPat id) { constructLitPat(id) } or
+    TLiteral(Raw::Literal id) { constructLiteral(id) } or
    /**
     * INTERNAL: Do not use.
     */
-    TLiteralExpr(Raw::LiteralExpr id) { constructLiteralExpr(id) } or
+    TLiteralPat(Raw::LiteralPat id) { constructLiteralPat(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -187,6 +187,10 @@ module Synth {
     * INTERNAL: Do not use.
     */
    TPathPat(Raw::PathPat id) { constructPathPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TPrefixExpr(Raw::PrefixExpr id) { constructPrefixExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -198,19 +202,19 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TRecordFieldPat(Raw::RecordFieldPat id) { constructRecordFieldPat(id) } or
+    TRecordExpr(Raw::RecordExpr id) { constructRecordExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
-    TRecordLitExpr(Raw::RecordLitExpr id) { constructRecordLitExpr(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TRecordLitField(Raw::RecordLitField id) { constructRecordLitField(id) } or
+    TRecordExprField(Raw::RecordExprField id) { constructRecordExprField(id) } or
    /**
     * INTERNAL: Do not use.
     */
    TRecordPat(Raw::RecordPat id) { constructRecordPat(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TRecordPatField(Raw::RecordPatField id) { constructRecordPatField(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -246,11 +250,7 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TTypeRef(Raw::TypeRef id) { constructTypeRef(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TUnaryOpExpr(Raw::UnaryOpExpr id) { constructUnaryOpExpr(id) } or
+    TType(Raw::Type id) { constructType(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -276,7 +276,7 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TWildPat(Raw::WildPat id) { constructWildPat(id) } or
+    TWildcardPat(Raw::WildcardPat id) { constructWildcardPat(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -295,8 +295,8 @@ module Synth {
   * INTERNAL: Do not use.
   */
  class TAstNode =
-    TDeclaration or TExpr or TGenericArgs or TLabel or TMatchArm or TPat or TPath or
-        TRecordFieldPat or TRecordLitField or TStmt or TTypeRef;
+    TDeclaration or TExpr or TGenericArgList or TLabel or TMatchArm or TPat or TPath or
+        TRecordExprField or TRecordPatField or TStmt or TType;

  /**
   * INTERNAL: Do not use.
@@ -312,12 +312,12 @@ module Synth {
   * INTERNAL: Do not use.
   */
  class TExpr =
-    TArrayExpr or TAwaitExpr or TBecomeExpr or TBinaryOpExpr or TBlockExprBase or TBoxExpr or
+    TArrayExpr or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinExpr or TBlockExprBase or TBoxExpr or
        TBreakExpr or TCallExpr or TCastExpr or TClosureExpr or TConstExpr or TContinueExpr or
-        TFieldExpr or TIfExpr or TIndexExpr or TInlineAsmExpr or TLetExpr or TLiteralExpr or
-        TLoopExpr or TMatchExpr or TMethodCallExpr or TMissingExpr or TOffsetOfExpr or TPathExpr or
-        TRangeExpr or TRecordLitExpr or TRefExpr or TReturnExpr or TTupleExpr or TUnaryOpExpr or
-        TUnderscoreExpr or TYeetExpr or TYieldExpr;
+        TFieldExpr or TIfExpr or TIndexExpr or TLetExpr or TLiteral 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;

  /**
   * INTERNAL: Do not use.
@@ -338,8 +338,9 @@ module Synth {
   * INTERNAL: Do not use.
   */
  class TPat =
-    TBindPat or TBoxPat or TConstBlockPat or TLitPat or TMissingPat or TOrPat or TPathPat or
-        TRangePat or TRecordPat or TRefPat or TSlicePat or TTuplePat or TTupleStructPat or TWildPat;
+    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;

  /**
   * INTERNAL: Do not use.
@@ -349,7 +350,14 @@ module Synth {
  /**
   * INTERNAL: Do not use.
   */
-  class TUnimplemented = TGenericArgs or TPath or TTypeRef or TUnimplementedDeclaration;
+  class TUnimplemented = TGenericArgList or TPath or TType or TUnimplementedDeclaration;
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TAsmExpr`, if possible.
+   */
+  cached
+  TAsmExpr convertAsmExprFromRaw(Raw::Element e) { result = TAsmExpr(e) }

  /**
   * INTERNAL: Do not use.
@@ -374,17 +382,10 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TBinaryOpExpr`, if possible.
+   * Converts a raw element to a synthesized `TBinExpr`, if possible.
   */
  cached
-  TBinaryOpExpr convertBinaryOpExprFromRaw(Raw::Element e) { result = TBinaryOpExpr(e) }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TBindPat`, if possible.
-   */
-  cached
-  TBindPat convertBindPatFromRaw(Raw::Element e) { result = TBindPat(e) }
+  TBinExpr convertBinExprFromRaw(Raw::Element e) { result = TBinExpr(e) }

  /**
   * INTERNAL: Do not use.
@@ -500,10 +501,17 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TGenericArgs`, if possible.
+   * Converts a raw element to a synthesized `TGenericArgList`, if possible.
   */
  cached
-  TGenericArgs convertGenericArgsFromRaw(Raw::Element e) { result = TGenericArgs(e) }
+  TGenericArgList convertGenericArgListFromRaw(Raw::Element e) { result = TGenericArgList(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TIdentPat`, if possible.
+   */
+  cached
+  TIdentPat convertIdentPatFromRaw(Raw::Element e) { result = TIdentPat(e) }

  /**
   * INTERNAL: Do not use.
@@ -519,13 +527,6 @@ module Synth {
  cached
  TIndexExpr convertIndexExprFromRaw(Raw::Element e) { result = TIndexExpr(e) }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TInlineAsmExpr`, if possible.
-   */
-  cached
-  TInlineAsmExpr convertInlineAsmExprFromRaw(Raw::Element e) { result = TInlineAsmExpr(e) }
-
  /**
   * INTERNAL: Do not use.
   * Converts a raw element to a synthesized `TItemStmt`, if possible.
@@ -556,17 +557,17 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TLitPat`, if possible.
+   * Converts a raw element to a synthesized `TLiteral`, if possible.
   */
  cached
-  TLitPat convertLitPatFromRaw(Raw::Element e) { result = TLitPat(e) }
+  TLiteral convertLiteralFromRaw(Raw::Element e) { result = TLiteral(e) }

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TLiteralExpr`, if possible.
+   * Converts a raw element to a synthesized `TLiteralPat`, if possible.
   */
  cached
-  TLiteralExpr convertLiteralExprFromRaw(Raw::Element e) { result = TLiteralExpr(e) }
+  TLiteralPat convertLiteralPatFromRaw(Raw::Element e) { result = TLiteralPat(e) }

  /**
   * INTERNAL: Do not use.
@@ -652,6 +653,13 @@ module Synth {
  cached
  TPathPat convertPathPatFromRaw(Raw::Element e) { result = TPathPat(e) }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TPrefixExpr`, if possible.
+   */
+  cached
+  TPrefixExpr convertPrefixExprFromRaw(Raw::Element e) { result = TPrefixExpr(e) }
+
  /**
   * INTERNAL: Do not use.
   * Converts a raw element to a synthesized `TRangeExpr`, if possible.
@@ -668,24 +676,17 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordFieldPat`, if possible.
+   * Converts a raw element to a synthesized `TRecordExpr`, if possible.
   */
  cached
-  TRecordFieldPat convertRecordFieldPatFromRaw(Raw::Element e) { result = TRecordFieldPat(e) }
+  TRecordExpr convertRecordExprFromRaw(Raw::Element e) { result = TRecordExpr(e) }

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordLitExpr`, if possible.
+   * Converts a raw element to a synthesized `TRecordExprField`, if possible.
   */
  cached
-  TRecordLitExpr convertRecordLitExprFromRaw(Raw::Element e) { result = TRecordLitExpr(e) }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRecordLitField`, if possible.
-   */
-  cached
-  TRecordLitField convertRecordLitFieldFromRaw(Raw::Element e) { result = TRecordLitField(e) }
+  TRecordExprField convertRecordExprFieldFromRaw(Raw::Element e) { result = TRecordExprField(e) }

  /**
   * INTERNAL: Do not use.
@@ -694,6 +695,13 @@ module Synth {
  cached
  TRecordPat convertRecordPatFromRaw(Raw::Element e) { result = TRecordPat(e) }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TRecordPatField`, if possible.
+   */
+  cached
+  TRecordPatField convertRecordPatFieldFromRaw(Raw::Element e) { result = TRecordPatField(e) }
+
  /**
   * INTERNAL: Do not use.
   * Converts a raw element to a synthesized `TRefExpr`, if possible.
@@ -752,17 +760,10 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TTypeRef`, if possible.
+   * Converts a raw element to a synthesized `TType`, if possible.
   */
  cached
-  TTypeRef convertTypeRefFromRaw(Raw::Element e) { result = TTypeRef(e) }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TUnaryOpExpr`, if possible.
-   */
-  cached
-  TUnaryOpExpr convertUnaryOpExprFromRaw(Raw::Element e) { result = TUnaryOpExpr(e) }
+  TType convertTypeFromRaw(Raw::Element e) { result = TType(e) }

  /**
   * INTERNAL: Do not use.
@@ -803,10 +804,10 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TWildPat`, if possible.
+   * Converts a raw element to a synthesized `TWildcardPat`, if possible.
   */
  cached
-  TWildPat convertWildPatFromRaw(Raw::Element e) { result = TWildPat(e) }
+  TWildcardPat convertWildcardPatFromRaw(Raw::Element e) { result = TWildcardPat(e) }

  /**
   * INTERNAL: Do not use.
@@ -843,7 +844,7 @@ module Synth {
    or
    result = convertExprFromRaw(e)
    or
-    result = convertGenericArgsFromRaw(e)
+    result = convertGenericArgListFromRaw(e)
    or
    result = convertLabelFromRaw(e)
    or
@@ -853,13 +854,13 @@ module Synth {
    or
    result = convertPathFromRaw(e)
    or
-    result = convertRecordFieldPatFromRaw(e)
+    result = convertRecordExprFieldFromRaw(e)
    or
-    result = convertRecordLitFieldFromRaw(e)
+    result = convertRecordPatFieldFromRaw(e)
    or
    result = convertStmtFromRaw(e)
    or
-    result = convertTypeRefFromRaw(e)
+    result = convertTypeFromRaw(e)
  }

  /**
@@ -911,11 +912,13 @@ module Synth {
  TExpr convertExprFromRaw(Raw::Element e) {
    result = convertArrayExprFromRaw(e)
    or
+    result = convertAsmExprFromRaw(e)
+    or
    result = convertAwaitExprFromRaw(e)
    or
    result = convertBecomeExprFromRaw(e)
    or
-    result = convertBinaryOpExprFromRaw(e)
+    result = convertBinExprFromRaw(e)
    or
    result = convertBlockExprBaseFromRaw(e)
    or
@@ -939,11 +942,9 @@ module Synth {
    or
    result = convertIndexExprFromRaw(e)
    or
-    result = convertInlineAsmExprFromRaw(e)
-    or
    result = convertLetExprFromRaw(e)
    or
-    result = convertLiteralExprFromRaw(e)
+    result = convertLiteralFromRaw(e)
    or
    result = convertLoopExprFromRaw(e)
    or
@@ -957,9 +958,11 @@ module Synth {
    or
    result = convertPathExprFromRaw(e)
    or
+    result = convertPrefixExprFromRaw(e)
+    or
    result = convertRangeExprFromRaw(e)
    or
-    result = convertRecordLitExprFromRaw(e)
+    result = convertRecordExprFromRaw(e)
    or
    result = convertRefExprFromRaw(e)
    or
@@ -967,8 +970,6 @@ module Synth {
    or
    result = convertTupleExprFromRaw(e)
    or
-    result = convertUnaryOpExprFromRaw(e)
-    or
    result = convertUnderscoreExprFromRaw(e)
    or
    result = convertYeetExprFromRaw(e)
@@ -1011,13 +1012,13 @@ module Synth {
   */
  cached
  TPat convertPatFromRaw(Raw::Element e) {
-    result = convertBindPatFromRaw(e)
-    or
    result = convertBoxPatFromRaw(e)
    or
    result = convertConstBlockPatFromRaw(e)
    or
-    result = convertLitPatFromRaw(e)
+    result = convertIdentPatFromRaw(e)
+    or
+    result = convertLiteralPatFromRaw(e)
    or
    result = convertMissingPatFromRaw(e)
    or
@@ -1037,7 +1038,7 @@ module Synth {
    or
    result = convertTupleStructPatFromRaw(e)
    or
-    result = convertWildPatFromRaw(e)
+    result = convertWildcardPatFromRaw(e)
  }

  /**
@@ -1059,15 +1060,22 @@ module Synth {
   */
  cached
  TUnimplemented convertUnimplementedFromRaw(Raw::Element e) {
-    result = convertGenericArgsFromRaw(e)
+    result = convertGenericArgListFromRaw(e)
    or
    result = convertPathFromRaw(e)
    or
-    result = convertTypeRefFromRaw(e)
+    result = convertTypeFromRaw(e)
    or
    result = convertUnimplementedDeclarationFromRaw(e)
  }

+  /**
+   * 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 `TAsyncBlockExpr` to a raw DB element, if possible.
@@ -1091,17 +1099,10 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TBinaryOpExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TBinExpr` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertBinaryOpExprToRaw(TBinaryOpExpr e) { e = TBinaryOpExpr(result) }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TBindPat` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertBindPatToRaw(TBindPat e) { e = TBindPat(result) }
+  Raw::Element convertBinExprToRaw(TBinExpr e) { e = TBinExpr(result) }

  /**
   * INTERNAL: Do not use.
@@ -1217,10 +1218,17 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TGenericArgs` to a raw DB element, if possible.
+   * Converts a synthesized `TGenericArgList` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertGenericArgsToRaw(TGenericArgs e) { e = TGenericArgs(result) }
+  Raw::Element convertGenericArgListToRaw(TGenericArgList e) { e = TGenericArgList(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.
@@ -1236,13 +1244,6 @@ module Synth {
  cached
  Raw::Element convertIndexExprToRaw(TIndexExpr e) { e = TIndexExpr(result) }

-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TInlineAsmExpr` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertInlineAsmExprToRaw(TInlineAsmExpr e) { e = TInlineAsmExpr(result) }
-
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TItemStmt` to a raw DB element, if possible.
@@ -1273,17 +1274,17 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TLitPat` to a raw DB element, if possible.
+   * Converts a synthesized `TLiteral` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertLitPatToRaw(TLitPat e) { e = TLitPat(result) }
+  Raw::Element convertLiteralToRaw(TLiteral e) { e = TLiteral(result) }

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TLiteralExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TLiteralPat` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertLiteralExprToRaw(TLiteralExpr e) { e = TLiteralExpr(result) }
+  Raw::Element convertLiteralPatToRaw(TLiteralPat e) { e = TLiteralPat(result) }

  /**
   * INTERNAL: Do not use.
@@ -1369,6 +1370,13 @@ module Synth {
  cached
  Raw::Element convertPathPatToRaw(TPathPat e) { e = TPathPat(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 `TRangeExpr` to a raw DB element, if possible.
@@ -1385,24 +1393,17 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordFieldPat` to a raw DB element, if possible.
+   * Converts a synthesized `TRecordExpr` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertRecordFieldPatToRaw(TRecordFieldPat e) { e = TRecordFieldPat(result) }
+  Raw::Element convertRecordExprToRaw(TRecordExpr e) { e = TRecordExpr(result) }

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordLitExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TRecordExprField` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertRecordLitExprToRaw(TRecordLitExpr e) { e = TRecordLitExpr(result) }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TRecordLitField` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertRecordLitFieldToRaw(TRecordLitField e) { e = TRecordLitField(result) }
+  Raw::Element convertRecordExprFieldToRaw(TRecordExprField e) { e = TRecordExprField(result) }

  /**
   * INTERNAL: Do not use.
@@ -1411,6 +1412,13 @@ module Synth {
  cached
  Raw::Element convertRecordPatToRaw(TRecordPat e) { e = TRecordPat(result) }

+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TRecordPatField` to a raw DB element, if possible.
+   */
+  cached
+  Raw::Element convertRecordPatFieldToRaw(TRecordPatField e) { e = TRecordPatField(result) }
+
  /**
   * INTERNAL: Do not use.
   * Converts a synthesized `TRefExpr` to a raw DB element, if possible.
@@ -1469,17 +1477,10 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TTypeRef` to a raw DB element, if possible.
+   * Converts a synthesized `TType` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertTypeRefToRaw(TTypeRef e) { e = TTypeRef(result) }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TUnaryOpExpr` to a raw DB element, if possible.
-   */
-  cached
-  Raw::Element convertUnaryOpExprToRaw(TUnaryOpExpr e) { e = TUnaryOpExpr(result) }
+  Raw::Element convertTypeToRaw(TType e) { e = TType(result) }

  /**
   * INTERNAL: Do not use.
@@ -1520,10 +1521,10 @@ module Synth {

  /**
   * INTERNAL: Do not use.
-   * Converts a synthesized `TWildPat` to a raw DB element, if possible.
+   * Converts a synthesized `TWildcardPat` to a raw DB element, if possible.
   */
  cached
-  Raw::Element convertWildPatToRaw(TWildPat e) { e = TWildPat(result) }
+  Raw::Element convertWildcardPatToRaw(TWildcardPat e) { e = TWildcardPat(result) }

  /**
   * INTERNAL: Do not use.
@@ -1560,7 +1561,7 @@ module Synth {
    or
    result = convertExprToRaw(e)
    or
-    result = convertGenericArgsToRaw(e)
+    result = convertGenericArgListToRaw(e)
    or
    result = convertLabelToRaw(e)
    or
@@ -1570,13 +1571,13 @@ module Synth {
    or
    result = convertPathToRaw(e)
    or
-    result = convertRecordFieldPatToRaw(e)
+    result = convertRecordExprFieldToRaw(e)
    or
-    result = convertRecordLitFieldToRaw(e)
+    result = convertRecordPatFieldToRaw(e)
    or
    result = convertStmtToRaw(e)
    or
-    result = convertTypeRefToRaw(e)
+    result = convertTypeToRaw(e)
  }

  /**
@@ -1628,11 +1629,13 @@ module Synth {
  Raw::Element convertExprToRaw(TExpr e) {
    result = convertArrayExprToRaw(e)
    or
+    result = convertAsmExprToRaw(e)
+    or
    result = convertAwaitExprToRaw(e)
    or
    result = convertBecomeExprToRaw(e)
    or
-    result = convertBinaryOpExprToRaw(e)
+    result = convertBinExprToRaw(e)
    or
    result = convertBlockExprBaseToRaw(e)
    or
@@ -1656,11 +1659,9 @@ module Synth {
    or
    result = convertIndexExprToRaw(e)
    or
-    result = convertInlineAsmExprToRaw(e)
-    or
    result = convertLetExprToRaw(e)
    or
-    result = convertLiteralExprToRaw(e)
+    result = convertLiteralToRaw(e)
    or
    result = convertLoopExprToRaw(e)
    or
@@ -1674,9 +1675,11 @@ module Synth {
    or
    result = convertPathExprToRaw(e)
    or
+    result = convertPrefixExprToRaw(e)
+    or
    result = convertRangeExprToRaw(e)
    or
-    result = convertRecordLitExprToRaw(e)
+    result = convertRecordExprToRaw(e)
    or
    result = convertRefExprToRaw(e)
    or
@@ -1684,8 +1687,6 @@ module Synth {
    or
    result = convertTupleExprToRaw(e)
    or
-    result = convertUnaryOpExprToRaw(e)
-    or
    result = convertUnderscoreExprToRaw(e)
    or
    result = convertYeetExprToRaw(e)
@@ -1728,13 +1729,13 @@ module Synth {
   */
  cached
  Raw::Element convertPatToRaw(TPat e) {
-    result = convertBindPatToRaw(e)
-    or
    result = convertBoxPatToRaw(e)
    or
    result = convertConstBlockPatToRaw(e)
    or
-    result = convertLitPatToRaw(e)
+    result = convertIdentPatToRaw(e)
+    or
+    result = convertLiteralPatToRaw(e)
    or
    result = convertMissingPatToRaw(e)
    or
@@ -1754,7 +1755,7 @@ module Synth {
    or
    result = convertTupleStructPatToRaw(e)
    or
-    result = convertWildPatToRaw(e)
+    result = convertWildcardPatToRaw(e)
  }

  /**
@@ -1776,11 +1777,11 @@ module Synth {
   */
  cached
  Raw::Element convertUnimplementedToRaw(TUnimplemented e) {
-    result = convertGenericArgsToRaw(e)
+    result = convertGenericArgListToRaw(e)
    or
    result = convertPathToRaw(e)
    or
-    result = convertTypeRefToRaw(e)
+    result = convertTypeToRaw(e)
    or
    result = convertUnimplementedDeclarationToRaw(e)
  }
--- a/rust/ql/lib/codeql/rust/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/generated/SynthConstructors.qll
@@ -3,11 +3,11 @@
 * This module exports all modules providing `Element` subclasses.
 */

+import codeql.rust.elements.AsmExprConstructor
 import codeql.rust.elements.AsyncBlockExprConstructor
 import codeql.rust.elements.AwaitExprConstructor
 import codeql.rust.elements.BecomeExprConstructor
-import codeql.rust.elements.BinaryOpExprConstructor
-import codeql.rust.elements.BindPatConstructor
+import codeql.rust.elements.BinExprConstructor
 import codeql.rust.elements.BlockExprConstructor
 import codeql.rust.elements.BoxExprConstructor
 import codeql.rust.elements.BoxPatConstructor
@@ -24,16 +24,16 @@ import codeql.rust.elements.ElementListExprConstructor
 import codeql.rust.elements.ExprStmtConstructor
 import codeql.rust.elements.FieldExprConstructor
 import codeql.rust.elements.FunctionConstructor
-import codeql.rust.elements.GenericArgsConstructor
+import codeql.rust.elements.GenericArgListConstructor
+import codeql.rust.elements.IdentPatConstructor
 import codeql.rust.elements.IfExprConstructor
 import codeql.rust.elements.IndexExprConstructor
-import codeql.rust.elements.InlineAsmExprConstructor
 import codeql.rust.elements.ItemStmtConstructor
 import codeql.rust.elements.LabelConstructor
 import codeql.rust.elements.LetExprConstructor
 import codeql.rust.elements.LetStmtConstructor
-import codeql.rust.elements.LitPatConstructor
-import codeql.rust.elements.LiteralExprConstructor
+import codeql.rust.elements.LiteralConstructor
+import codeql.rust.elements.LiteralPatConstructor
 import codeql.rust.elements.LoopExprConstructor
 import codeql.rust.elements.MatchArmConstructor
 import codeql.rust.elements.MatchExprConstructor
@@ -46,12 +46,13 @@ import codeql.rust.elements.OrPatConstructor
 import codeql.rust.elements.PathConstructor
 import codeql.rust.elements.PathExprConstructor
 import codeql.rust.elements.PathPatConstructor
+import codeql.rust.elements.PrefixExprConstructor
 import codeql.rust.elements.RangeExprConstructor
 import codeql.rust.elements.RangePatConstructor
-import codeql.rust.elements.RecordFieldPatConstructor
-import codeql.rust.elements.RecordLitExprConstructor
-import codeql.rust.elements.RecordLitFieldConstructor
+import codeql.rust.elements.RecordExprConstructor
+import codeql.rust.elements.RecordExprFieldConstructor
 import codeql.rust.elements.RecordPatConstructor
+import codeql.rust.elements.RecordPatFieldConstructor
 import codeql.rust.elements.RefExprConstructor
 import codeql.rust.elements.RefPatConstructor
 import codeql.rust.elements.RepeatExprConstructor
@@ -60,11 +61,10 @@ import codeql.rust.elements.SlicePatConstructor
 import codeql.rust.elements.TupleExprConstructor
 import codeql.rust.elements.TuplePatConstructor
 import codeql.rust.elements.TupleStructPatConstructor
-import codeql.rust.elements.TypeRefConstructor
-import codeql.rust.elements.UnaryOpExprConstructor
+import codeql.rust.elements.TypeConstructor
 import codeql.rust.elements.UnderscoreExprConstructor
 import codeql.rust.elements.UnimplementedDeclarationConstructor
 import codeql.rust.elements.UnsafeBlockExprConstructor
-import codeql.rust.elements.WildPatConstructor
+import codeql.rust.elements.WildcardPatConstructor
 import codeql.rust.elements.YeetExprConstructor
 import codeql.rust.elements.YieldExprConstructor
--- a/rust/ql/lib/codeql/rust/generated/TypeRef.qll
+++ b/rust/ql/lib/codeql/rust/generated/TypeRef.qll
@@ -1,6 +1,6 @@
 // generated by codegen
 /**
- * This module provides the generated definition of `TypeRef`.
+ * This module provides the generated definition of `Type`.
 * INTERNAL: Do not import directly.
 */

@@ -10,7 +10,7 @@ import codeql.rust.elements.AstNode
 import codeql.rust.elements.Unimplemented

 /**
- * INTERNAL: This module contains the fully generated definition of `TypeRef` and should not
+ * INTERNAL: This module contains the fully generated definition of `Type` and should not
 * be referenced directly.
 */
 module Generated {
@@ -21,10 +21,10 @@ module Generated {
   * 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.
+   * INTERNAL: Do not reference the `Generated::Type` class directly.
+   * Use the subclass `Type`, where the following predicates are available.
   */
-  class TypeRef extends Synth::TTypeRef, AstNode, Unimplemented {
-    override string getAPrimaryQlClass() { result = "TypeRef" }
+  class Type extends Synth::TType, AstNode, Unimplemented {
+    override string getAPrimaryQlClass() { result = "Type" }
  }
 }
--- a/rust/ql/lib/codeql/rust/generated/UnaryOpExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/UnaryOpExpr.qll
@@ -1,42 +0,0 @@
-// generated by codegen
-/**
- * This module provides the generated definition of `UnaryOpExpr`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.generated.Synth
-private import codeql.rust.generated.Raw
-import codeql.rust.elements.Expr
-
-/**
- * INTERNAL: This module contains the fully generated definition of `UnaryOpExpr` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A unary operation expression. For example:
-   * ```
-   * let x = -42
-   * let y = !true
-   * let z = *ptr
-   * ```
-   * INTERNAL: Do not reference the `Generated::UnaryOpExpr` class directly.
-   * Use the subclass `UnaryOpExpr`, where the following predicates are available.
-   */
-  class UnaryOpExpr extends Synth::TUnaryOpExpr, Expr {
-    override string getAPrimaryQlClass() { result = "UnaryOpExpr" }
-
-    /**
-     * Gets the expression of this unary op expression.
-     */
-    Expr getExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertUnaryOpExprToRaw(this).(Raw::UnaryOpExpr).getExpr())
-    }
-
-    /**
-     * Gets the op of this unary op expression.
-     */
-    string getOp() { result = Synth::convertUnaryOpExprToRaw(this).(Raw::UnaryOpExpr).getOp() }
-  }
-}
--- a/rust/ql/lib/codeql/rust/generated/WildcardPat.qll
+++ b/rust/ql/lib/codeql/rust/generated/WildcardPat.qll
@@ -1,6 +1,6 @@
 // generated by codegen
 /**
- * This module provides the generated definition of `WildPat`.
+ * This module provides the generated definition of `WildcardPat`.
 * INTERNAL: Do not import directly.
 */

@@ -9,7 +9,7 @@ private import codeql.rust.generated.Raw
 import codeql.rust.elements.Pat

 /**
- * INTERNAL: This module contains the fully generated definition of `WildPat` and should not
+ * INTERNAL: This module contains the fully generated definition of `WildcardPat` and should not
 * be referenced directly.
 */
 module Generated {
@@ -18,10 +18,10 @@ module Generated {
   * ```
   * let _ = 42;
   * ```
-   * INTERNAL: Do not reference the `Generated::WildPat` class directly.
-   * Use the subclass `WildPat`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::WildcardPat` class directly.
+   * Use the subclass `WildcardPat`, where the following predicates are available.
   */
-  class WildPat extends Synth::TWildPat, Pat {
-    override string getAPrimaryQlClass() { result = "WildPat" }
+  class WildcardPat extends Synth::TWildcardPat, Pat {
+    override string getAPrimaryQlClass() { result = "WildcardPat" }
  }
 }
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -53,24 +53,24 @@ locations(
 );

@unimplemented =
-  @generic_args
+  @generic_arg_list
 | @path
-| @type_ref
+| @type
 | @unimplemented_declaration
 ;

@ast_node =
  @declaration
 | @expr
-| @generic_args
+| @generic_arg_list
 | @label
 | @match_arm
 | @pat
 | @path
-| @record_field_pat
-| @record_lit_field
+| @record_expr_field
+| @record_pat_field
 | @stmt
-| @type_ref
+| @type
 ;

 db_files(
@@ -89,9 +89,10 @@ db_locations(

@expr =
  @array_expr
+| @asm_expr
 | @await_expr
 | @become_expr
-| @binary_op_expr
+| @bin_expr
 | @block_expr_base
 | @box_expr
 | @break_expr
@@ -103,28 +104,27 @@ db_locations(
 | @field_expr
 | @if_expr
 | @index_expr
-| @inline_asm_expr
 | @let_expr
-| @literal_expr
+| @literal
 | @loop_expr
 | @match_expr
 | @method_call_expr
 | @missing_expr
 | @offset_of_expr
 | @path_expr
+| @prefix_expr
 | @range_expr
-| @record_lit_expr
+| @record_expr
 | @ref_expr
 | @return_expr
 | @tuple_expr
-| @unary_op_expr
 | @underscore_expr
 | @yeet_expr
 | @yield_expr
 ;

-generic_args(
-  unique int id: @generic_args
+generic_arg_lists(
+  unique int id: @generic_arg_list
 );

 labels(
@@ -145,10 +145,10 @@ match_arm_guards(
 );

@pat =
-  @bind_pat
-| @box_pat
+  @box_pat
 | @const_block_pat
-| @lit_pat
+| @ident_pat
+| @literal_pat
 | @missing_pat
 | @or_pat
 | @path_pat
@@ -158,33 +158,33 @@ match_arm_guards(
 | @slice_pat
 | @tuple_pat
 | @tuple_struct_pat
-| @wild_pat
+| @wildcard_pat
 ;

 paths(
  unique int id: @path
 );

-record_field_pats(
-  unique int id: @record_field_pat,
-  string name: string ref,
-  int pat: @pat ref
-);
-
-record_lit_fields(
-  unique int id: @record_lit_field,
+record_expr_fields(
+  unique int id: @record_expr_field,
  string name: string ref,
  int expr: @expr ref
 );

+record_pat_fields(
+  unique int id: @record_pat_field,
+  string name: string ref,
+  int pat: @pat ref
+);
+
@stmt =
  @expr_stmt
 | @item_stmt
 | @let_stmt
 ;

-type_refs(
-  unique int id: @type_ref
+types(
+  unique int id: @type
 );

@array_expr =
@@ -192,6 +192,11 @@ type_refs(
 | @repeat_expr
 ;

+asm_exprs(
+  unique int id: @asm_expr,
+  int expr: @expr ref
+);
+
 await_exprs(
  unique int id: @await_expr,
  int expr: @expr ref
@@ -202,29 +207,18 @@ become_exprs(
  int expr: @expr ref
 );

-binary_op_exprs(
-  unique int id: @binary_op_expr,
+bin_exprs(
+  unique int id: @bin_expr,
  int lhs: @expr ref,
  int rhs: @expr ref
 );

 #keyset[id]
-binary_op_expr_ops(
-  int id: @binary_op_expr ref,
+bin_expr_ops(
+  int id: @bin_expr ref,
  string op: string ref
 );

-bind_pats(
-  unique int id: @bind_pat,
-  string binding_id: string ref
-);
-
-#keyset[id]
-bind_pat_subpats(
-  int id: @bind_pat ref,
-  int subpat: @pat ref
-);
-
@block_expr_base =
  @async_block_expr
 | @block_expr
@@ -290,7 +284,7 @@ call_expr_is_assignee_expr(
 cast_exprs(
  unique int id: @cast_expr,
  int expr: @expr ref,
-  int type_ref: @type_ref ref
+  int type_: @type ref
 );

 closure_exprs(
@@ -310,13 +304,13 @@ closure_expr_args(
 closure_expr_arg_types(
  int id: @closure_expr ref,
  int index: int ref,
-  int arg_type: @type_ref ref
+  int arg_type: @type ref
 );

 #keyset[id]
 closure_expr_ret_types(
  int id: @closure_expr ref,
-  int ret_type: @type_ref ref
+  int ret_type: @type ref
 );

 #keyset[id]
@@ -366,6 +360,17 @@ functions(
  int body: @expr ref
 );

+ident_pats(
+  unique int id: @ident_pat,
+  string binding_id: string ref
+);
+
+#keyset[id]
+ident_pat_subpats(
+  int id: @ident_pat ref,
+  int subpat: @pat ref
+);
+
 if_exprs(
  unique int id: @if_expr,
  int condition: @expr ref,
@@ -389,11 +394,6 @@ index_expr_is_assignee_expr(
  int id: @index_expr ref
 );

-inline_asm_exprs(
-  unique int id: @inline_asm_expr,
-  int expr: @expr ref
-);
-
 item_stmts(
  unique int id: @item_stmt
 );
@@ -410,9 +410,9 @@ let_stmts(
 );

 #keyset[id]
-let_stmt_type_refs(
+let_stmt_types(
  int id: @let_stmt ref,
-  int type_ref: @type_ref ref
+  int type_: @type ref
 );

 #keyset[id]
@@ -427,13 +427,13 @@ let_stmt_elses(
  int else: @expr ref
 );

-lit_pats(
-  unique int id: @lit_pat,
-  int expr: @expr ref
+literals(
+  unique int id: @literal
 );

-literal_exprs(
-  unique int id: @literal_expr
+literal_pats(
+  unique int id: @literal_pat,
+  int expr: @expr ref
 );

 loop_exprs(
@@ -475,7 +475,7 @@ method_call_expr_args(
 #keyset[id]
 method_call_expr_generic_args(
  int id: @method_call_expr ref,
-  int generic_args: @generic_args ref
+  int generic_args: @generic_arg_list ref
 );

 missing_exprs(
@@ -499,7 +499,7 @@ module_declarations(

 offset_of_exprs(
  unique int id: @offset_of_expr,
-  int container: @type_ref ref
+  int container: @type ref
 );

 #keyset[id, index]
@@ -530,6 +530,12 @@ path_pats(
  int path: @path ref
 );

+prefix_exprs(
+  unique int id: @prefix_expr,
+  int expr: @expr ref,
+  string op: string ref
+);
+
 range_exprs(
  unique int id: @range_expr
 );
@@ -567,37 +573,37 @@ range_pat_ends(
  int end: @pat ref
 );

-record_lit_exprs(
-  unique int id: @record_lit_expr
+record_exprs(
+  unique int id: @record_expr
 );

 #keyset[id]
-record_lit_expr_paths(
-  int id: @record_lit_expr ref,
+record_expr_paths(
+  int id: @record_expr ref,
  int path: @path ref
 );

 #keyset[id, index]
-record_lit_expr_fields(
-  int id: @record_lit_expr ref,
+record_expr_fields(
+  int id: @record_expr ref,
  int index: int ref,
-  int field: @record_lit_field ref
+  int field: @record_expr_field ref
 );

 #keyset[id]
-record_lit_expr_spreads(
-  int id: @record_lit_expr ref,
+record_expr_spreads(
+  int id: @record_expr ref,
  int spread: @expr ref
 );

 #keyset[id]
-record_lit_expr_has_ellipsis(
-  int id: @record_lit_expr ref
+record_expr_has_ellipsis(
+  int id: @record_expr ref
 );

 #keyset[id]
-record_lit_expr_is_assignee_expr(
-  int id: @record_lit_expr ref
+record_expr_is_assignee_expr(
+  int id: @record_expr ref
 );

 record_pats(
@@ -614,7 +620,7 @@ record_pat_paths(
 record_pat_args(
  int id: @record_pat ref,
  int index: int ref,
-  int arg: @record_field_pat ref
+  int arg: @record_pat_field ref
 );

 #keyset[id]
@@ -737,12 +743,6 @@ tuple_struct_pat_ellipsis_indices(
  int ellipsis_index: int ref
 );

-unary_op_exprs(
-  unique int id: @unary_op_expr,
-  int expr: @expr ref,
-  string op: string ref
-);
-
 underscore_exprs(
  unique int id: @underscore_expr
 );
@@ -751,8 +751,8 @@ unimplemented_declarations(
  unique int id: @unimplemented_declaration
 );

-wild_pats(
-  unique int id: @wild_pat
+wildcard_pats(
+  unique int id: @wildcard_pat
 );

 yeet_exprs(
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -1,8 +1,8 @@
+AsmExpr/gen_asm_expr.rs 98d1a2525501416434a087b3791268691e5420f122f6e4d6d868a4273ce89ca5 98d1a2525501416434a087b3791268691e5420f122f6e4d6d868a4273ce89ca5
 AsyncBlockExpr/gen_async_block_expr.rs 63b31fbeeead710902aa31184c06e88e604a1b7ff3308aba52b5d6a965870ff6 63b31fbeeead710902aa31184c06e88e604a1b7ff3308aba52b5d6a965870ff6
 AwaitExpr/gen_await_expr.rs 09632657a74dda663c217b0e16d7f1b33f7f49efb2ef480c0d2cc9c66b65202b 09632657a74dda663c217b0e16d7f1b33f7f49efb2ef480c0d2cc9c66b65202b
 BecomeExpr/gen_become_expr.rs 15f42386c7362b50d8bcefda432167104e537fa63f038c1ab016f75a171f728c 15f42386c7362b50d8bcefda432167104e537fa63f038c1ab016f75a171f728c
-BinaryOpExpr/gen_binary_op_expr.rs a0d68df2a7cb33e08a2d3a9f8e1f3a84b07d458c66201fe6a012e99498c63ce3 a0d68df2a7cb33e08a2d3a9f8e1f3a84b07d458c66201fe6a012e99498c63ce3
-BindPat/gen_bind_pat.rs 38da98911aaaf5bccfafe40a116b6b1c02d1a3a4b170113129ecf4fd43cc66e4 38da98911aaaf5bccfafe40a116b6b1c02d1a3a4b170113129ecf4fd43cc66e4
+BinExpr/gen_bin_expr.rs fcfdfa8cc35f12c9a1114cdbc00b06e9759abae9ee8a4a3fed19f979dc6fed4d fcfdfa8cc35f12c9a1114cdbc00b06e9759abae9ee8a4a3fed19f979dc6fed4d
 BlockExpr/gen_block_expr.rs b09aa0406d2e772bc14bb1be4959ac21ebaf75c65a1d9f92bb3d8be5fd571023 b09aa0406d2e772bc14bb1be4959ac21ebaf75c65a1d9f92bb3d8be5fd571023
 BoxExpr/gen_box_expr.rs f4392a8e9daae2492c087fc8f7323f45ffbdb43a4ae5035be61e6edeaf427f23 f4392a8e9daae2492c087fc8f7323f45ffbdb43a4ae5035be61e6edeaf427f23
 BoxPat/gen_box_pat.rs ba50537d68f9a635fc64ecd23955ef478e106e497c85ec2500b869673446ee67 ba50537d68f9a635fc64ecd23955ef478e106e497c85ec2500b869673446ee67
@@ -17,15 +17,15 @@ ElementListExpr/gen_element_list_expr.rs 66f8a3c4e02767e96692c44ada6fe7ed2b07b1a
 ExprStmt/gen_expr_stmt.rs eedad804b2fbd49385c284ece44ecddf18eb56b61ff54607dfdd6521e2481c93 eedad804b2fbd49385c284ece44ecddf18eb56b61ff54607dfdd6521e2481c93
 FieldExpr/gen_field_expr.rs 7ab04efc8b45892d3214eccaeac0b1659213623ae95acb463c531b865988f148 7ab04efc8b45892d3214eccaeac0b1659213623ae95acb463c531b865988f148
 Function/gen_function.rs 1048512614569eaf818e16a30df256556e25f3b7fb97eee2a8df4b0036b10e99 1048512614569eaf818e16a30df256556e25f3b7fb97eee2a8df4b0036b10e99
-GenericArgs/gen_generic_args.rs 9c559792205357f58472fe8136cc963a2732907c9d384458c6607dff593fb81a 9c559792205357f58472fe8136cc963a2732907c9d384458c6607dff593fb81a
+GenericArgList/gen_generic_arg_list.rs 428b05b7dd2c2060ac752f4d98a4d3daf44eb9f0a7cfb05bccbe284a91f4be27 428b05b7dd2c2060ac752f4d98a4d3daf44eb9f0a7cfb05bccbe284a91f4be27
+IdentPat/gen_ident_pat.rs f8cd49453ef1600542143c60ecefcf98cc1fb863735b78246017b516a0b5024d f8cd49453ef1600542143c60ecefcf98cc1fb863735b78246017b516a0b5024d
 IfExpr/gen_if_expr.rs 073ba575b54a553945d3131d7e92cdb1520c24f380361723a1b9d848b6296d7b 073ba575b54a553945d3131d7e92cdb1520c24f380361723a1b9d848b6296d7b
 IndexExpr/gen_index_expr.rs b1a1b9eadd40ac1652d944dc925337435ef5782bf485a0f0360c971f4938cdd8 b1a1b9eadd40ac1652d944dc925337435ef5782bf485a0f0360c971f4938cdd8
-InlineAsmExpr/gen_inline_asm_expr.rs b5dcc6bf748fe4c314804414d4d5d3708957a774469de8bf77b5721ca3684f9a b5dcc6bf748fe4c314804414d4d5d3708957a774469de8bf77b5721ca3684f9a
 Label/gen_label.rs 463ae5ff89ef1222896d7c2009fb8ae7f437c51bc767415e37f6a50b76b9edbd 463ae5ff89ef1222896d7c2009fb8ae7f437c51bc767415e37f6a50b76b9edbd
 LetExpr/gen_let_expr.rs 83e9726f3f14fb9d3d332462230fc939f0214216997f5ca84f58518ffd65653d 83e9726f3f14fb9d3d332462230fc939f0214216997f5ca84f58518ffd65653d
 LetStmt/gen_let_stmt.rs d22098db07cbdd4e4616c24bc9738f989e553336c7ce1a5391e1b403adb10dbb d22098db07cbdd4e4616c24bc9738f989e553336c7ce1a5391e1b403adb10dbb
-LitPat/gen_lit_pat.rs dc7f80f73290eb55515b20bf66f8fd5cd11f6fd088734fbf215c642630db0d09 dc7f80f73290eb55515b20bf66f8fd5cd11f6fd088734fbf215c642630db0d09
-LiteralExpr/gen_literal_expr.rs 302ebc81012fd46ccf8d960fe6ae691747bdec1c7cd52b0d47ed1273b4d8dc3a 302ebc81012fd46ccf8d960fe6ae691747bdec1c7cd52b0d47ed1273b4d8dc3a
+Literal/gen_literal.rs 5d0091bb686fb8d9b9115f9bb7a66d4d79dde7b0d66cc8e4df2ef00adaed25f1 5d0091bb686fb8d9b9115f9bb7a66d4d79dde7b0d66cc8e4df2ef00adaed25f1
+LiteralPat/gen_literal_pat.rs b97dfb678d9e78d8b1673862e6d88593cfccb648fd5915a5849eb20fdc5d2165 b97dfb678d9e78d8b1673862e6d88593cfccb648fd5915a5849eb20fdc5d2165
 LoopExpr/gen_loop_expr.rs 0a7e6dd7690fae82495c466f8a175b3a4097478041ec0e0bc0b7db97d2e50e66 0a7e6dd7690fae82495c466f8a175b3a4097478041ec0e0bc0b7db97d2e50e66
 MatchArm/gen_match_arm.rs b3d7fc8be0f739787415a4fc9788e462f3ea9f46fc2e734198745aaa62c0d0f4 b3d7fc8be0f739787415a4fc9788e462f3ea9f46fc2e734198745aaa62c0d0f4
 MatchExpr/gen_match_expr.rs 7b20fb5bd04d5c93021d7daf3be9f30c13c854fac088835d9d7d9d16c0d963c5 7b20fb5bd04d5c93021d7daf3be9f30c13c854fac088835d9d7d9d16c0d963c5
@@ -38,12 +38,13 @@ OrPat/gen_or_pat.rs a59e67d5481bb3c21b10eddb99d5dce1de4321dc584c91d72bd3ddb00a0e
 Path/gen_path.rs 9c70415477de7f794bc1b43eb5cc62a9d8280e312c0aa2039c7bf1f8d6760fb2 9c70415477de7f794bc1b43eb5cc62a9d8280e312c0aa2039c7bf1f8d6760fb2
 PathExpr/gen_path_expr.rs b29cc007c4a158fb2bc464db02464614f1664a80c67a81696978e2715ce2652d b29cc007c4a158fb2bc464db02464614f1664a80c67a81696978e2715ce2652d
 PathPat/gen_path_pat.rs a858875ccc5baffb04c46127e1f4cd41e5fcc7843eebbdf791c20ba2efe78e5a a858875ccc5baffb04c46127e1f4cd41e5fcc7843eebbdf791c20ba2efe78e5a
+PrefixExpr/gen_prefix_expr.rs 0fe7608d3c57813db30f36fde77a55d804e009f00d62e232fd050d5cfc5b1eaf 0fe7608d3c57813db30f36fde77a55d804e009f00d62e232fd050d5cfc5b1eaf
 RangeExpr/gen_range_expr.rs 3d77ccdc55a774c41b7d34773e5c65e4fdad6ef76aadd4d24c2694b324e9c006 3d77ccdc55a774c41b7d34773e5c65e4fdad6ef76aadd4d24c2694b324e9c006
 RangePat/gen_range_pat.rs f6661dd17ad104a8e80247e3c212517c6c888895edd86ac75f15ce0270eac0ce f6661dd17ad104a8e80247e3c212517c6c888895edd86ac75f15ce0270eac0ce
-RecordFieldPat/gen_record_field_pat.rs 75951d23c45d8ff426c05bf4f6abb7673b713f66c97340fcbbe57520ba40011f 75951d23c45d8ff426c05bf4f6abb7673b713f66c97340fcbbe57520ba40011f
-RecordLitExpr/gen_record_lit_expr.rs da87c8e281532866920ad1a352be3e6d226e21946bd52a9422bee3b264dc3c3a da87c8e281532866920ad1a352be3e6d226e21946bd52a9422bee3b264dc3c3a
-RecordLitField/gen_record_lit_field.rs 86e654672e4323f3347d1215784375cc61b2ce0d3a8e3d8822469b1f8ec0c89a 86e654672e4323f3347d1215784375cc61b2ce0d3a8e3d8822469b1f8ec0c89a
+RecordExpr/gen_record_expr.rs e0b332e4d8ce9b6830f8f29a14e422a8d4b1df18490d3082f2d98105bcf09748 e0b332e4d8ce9b6830f8f29a14e422a8d4b1df18490d3082f2d98105bcf09748
+RecordExprField/gen_record_expr_field.rs ca3335ee9a4e091f2a4ebc183bd6f8ff9cd8f37c22e3cab16d936aa4751e6608 ca3335ee9a4e091f2a4ebc183bd6f8ff9cd8f37c22e3cab16d936aa4751e6608
 RecordPat/gen_record_pat.rs 4df648cfb7babf7f3b610499f279681b20840b63eb6ebbdda996298d8ff28aed 4df648cfb7babf7f3b610499f279681b20840b63eb6ebbdda996298d8ff28aed
+RecordPatField/gen_record_pat_field.rs 83f05d7acccbf792f952272bf049253100d7590ce25c3665d7bb284f88cd62d5 83f05d7acccbf792f952272bf049253100d7590ce25c3665d7bb284f88cd62d5
 RefExpr/gen_ref_expr.rs b79b89935a758c51488ffe654c662bb51af867abd140825859db97197dc7af29 b79b89935a758c51488ffe654c662bb51af867abd140825859db97197dc7af29
 RefPat/gen_ref_pat.rs fe7a990172263730e412649f446cf9976633fb8f21fee1b5134f00f695bf5823 fe7a990172263730e412649f446cf9976633fb8f21fee1b5134f00f695bf5823
 RepeatExpr/gen_repeat_expr.rs 98e06e5b9d1750a6ec64513d451b7a46eb215e2f2a6d482eaeeb07dec6dc8564 98e06e5b9d1750a6ec64513d451b7a46eb215e2f2a6d482eaeeb07dec6dc8564
@@ -52,10 +53,9 @@ SlicePat/gen_slice_pat.rs fbbd5568cbadef51a7970fdbb8d99bf591e29d06987fe3c53b7c19
 TupleExpr/gen_tuple_expr.rs 3c51f3f94092fb1992e09a096f66304cdc6dbd34b205aa5a4a47216484f3c3e8 3c51f3f94092fb1992e09a096f66304cdc6dbd34b205aa5a4a47216484f3c3e8
 TuplePat/gen_tuple_pat.rs 344d309368c28aba203483f96a8f5456e76a92d35df672313ec88262e036d4cf 344d309368c28aba203483f96a8f5456e76a92d35df672313ec88262e036d4cf
 TupleStructPat/gen_tuple_struct_pat.rs 0d3f1ec362bd31cb690b4894a0d6fd695c0b1d80a931b609ad876590c0159f83 0d3f1ec362bd31cb690b4894a0d6fd695c0b1d80a931b609ad876590c0159f83
-TypeRef/gen_type_ref.rs 86362efc37ef9d8383854ac831ba576982e6676d037a85b45a5f7f4a3e8ff1e3 86362efc37ef9d8383854ac831ba576982e6676d037a85b45a5f7f4a3e8ff1e3
-UnaryOpExpr/gen_unary_op_expr.rs b56c95c11fe7f0b06fea1740dba991856daee4fb6bc051f56f831dca28d81987 b56c95c11fe7f0b06fea1740dba991856daee4fb6bc051f56f831dca28d81987
+Type/gen_type.rs c66f700db04fd4f2dd76ebe6fefbf5fff01e005df50ccf15885cc0ff7c138c26 c66f700db04fd4f2dd76ebe6fefbf5fff01e005df50ccf15885cc0ff7c138c26
 UnderscoreExpr/gen_underscore_expr.rs 34bfcf5e4a865e882aa40fdfdb93237a4ccfb0c1fb053ae184a38719b3727b7a 34bfcf5e4a865e882aa40fdfdb93237a4ccfb0c1fb053ae184a38719b3727b7a
 UnsafeBlockExpr/gen_unsafe_block_expr.rs 250656a4c0333c1260617117ae7ca96fc265d5109f948b90dce071867d020486 250656a4c0333c1260617117ae7ca96fc265d5109f948b90dce071867d020486
-WildPat/gen_wild_pat.rs 3a4a9e77d09a690fddca434368f33c2f009d1098e5fa7fe2b404608d24c343fd 3a4a9e77d09a690fddca434368f33c2f009d1098e5fa7fe2b404608d24c343fd
+WildcardPat/gen_wildcard_pat.rs aa5a5bc28a5fabe45f3d522e1b59bdf2fa5bd2848ec1f32263ef1f39a6b0290a aa5a5bc28a5fabe45f3d522e1b59bdf2fa5bd2848ec1f32263ef1f39a6b0290a
 YeetExpr/gen_yeet_expr.rs 060b64c82db9015a28f375c05b98e932a78c3b1e11dc171d0c4844c988c6d8d9 060b64c82db9015a28f375c05b98e932a78c3b1e11dc171d0c4844c988c6d8d9
 YieldExpr/gen_yield_expr.rs 4742abc490211a92cd2aa7ebf7f2749aff5227db64fb1b7b5ede20727140c445 4742abc490211a92cd2aa7ebf7f2749aff5227db64fb1b7b5ede20727140c445
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -1,10 +1,10 @@
 /.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
-/BinaryOpExpr/gen_binary_op_expr.rs linguist-generated
-/BindPat/gen_bind_pat.rs linguist-generated
+/BinExpr/gen_bin_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
@@ -19,15 +19,15 @@
 /ExprStmt/gen_expr_stmt.rs linguist-generated
 /FieldExpr/gen_field_expr.rs linguist-generated
 /Function/gen_function.rs linguist-generated
-/GenericArgs/gen_generic_args.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
-/InlineAsmExpr/gen_inline_asm_expr.rs linguist-generated
 /Label/gen_label.rs linguist-generated
 /LetExpr/gen_let_expr.rs linguist-generated
 /LetStmt/gen_let_stmt.rs linguist-generated
-/LitPat/gen_lit_pat.rs linguist-generated
-/LiteralExpr/gen_literal_expr.rs linguist-generated
+/Literal/gen_literal.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
@@ -40,12 +40,13 @@
 /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
-/RecordFieldPat/gen_record_field_pat.rs linguist-generated
-/RecordLitExpr/gen_record_lit_expr.rs linguist-generated
-/RecordLitField/gen_record_lit_field.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
@@ -54,10 +55,9 @@
 /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
-/UnaryOpExpr/gen_unary_op_expr.rs linguist-generated
+/Type/gen_type.rs linguist-generated
 /UnderscoreExpr/gen_underscore_expr.rs linguist-generated
 /UnsafeBlockExpr/gen_unsafe_block_expr.rs linguist-generated
-/WildPat/gen_wild_pat.rs linguist-generated
+/WildcardPat/gen_wildcard_pat.rs linguist-generated
 /YeetExpr/gen_yeet_expr.rs linguist-generated
 /YieldExpr/gen_yield_expr.rs linguist-generated
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils

-from LitPat x, Expr getExpr
+from AsmExpr x, Expr getExpr
 where
  toBeTested(x) and
  not x.isUnknown() and
--- a/rust/ql/test/extractor-tests/generated/InlineAsmExpr/gen_inline_asm_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/InlineAsmExpr/gen_inline_asm_expr.rs
@@ -1,6 +1,6 @@
 // generated by codegen

-fn test_inline_asm_expr() -> () {
+fn test_asm_expr() -> () {
    // An inline assembly expression. For example:
    unsafe {
        builtin # asm(_);
--- a/rust/ql/test/extractor-tests/generated/BinaryOpExpr/BinaryOpExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BinaryOpExpr/BinaryOpExpr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils

-from BinaryOpExpr x, Expr getLhs, Expr getRhs, string hasOp
+from BinExpr x, Expr getLhs, Expr getRhs, string hasOp
 where
  toBeTested(x) and
  not x.isUnknown() and
--- a/rust/ql/test/extractor-tests/generated/BinaryOpExpr/BinaryOpExpr_getOp.ql
+++ b/rust/ql/test/extractor-tests/generated/BinaryOpExpr/BinaryOpExpr_getOp.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

-from BinaryOpExpr x
+from BinExpr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getOp()
--- a/rust/ql/test/extractor-tests/generated/BinaryOpExpr/gen_binary_op_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/BinaryOpExpr/gen_binary_op_expr.rs
@@ -1,6 +1,6 @@
 // generated by codegen

-fn test_binary_op_expr() -> () {
+fn test_bin_expr() -> () {
    // A binary operation expression. For example:
    x + y;
    x && y;
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
@@ -2,10 +2,10 @@
 import codeql.rust.elements
 import TestUtils

-from CastExpr x, Expr getExpr, TypeRef getTypeRef
+from CastExpr x, Expr getExpr, Type getType
 where
  toBeTested(x) and
  not x.isUnknown() and
  getExpr = x.getExpr() and
-  getTypeRef = x.getTypeRef()
-select x, "getExpr:", getExpr, "getTypeRef:", getTypeRef
+  getType = x.getType()
+select x, "getExpr:", getExpr, "getType:", getType
--- a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql
+++ b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

-from GenericArgs x
+from GenericArgList x
 where toBeTested(x) and not x.isUnknown()
 select x
--- 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
@@ -1,6 +1,6 @@
 // generated by codegen

-fn test_generic_args() -> () {
+fn test_generic_arg_list() -> () {
    // The base class for generic arguments.
    x.foo::<u32, u64>(42);
 }
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils

-from BindPat x, string getBindingId, string hasSubpat
+from IdentPat x, string getBindingId, string hasSubpat
 where
  toBeTested(x) and
  not x.isUnknown() and
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getSubpat.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

-from BindPat x
+from IdentPat x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getSubpat()
--- a/rust/ql/test/extractor-tests/generated/IdentPat/gen_ident_pat.rs
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/gen_ident_pat.rs
@@ -1,6 +1,6 @@
 // generated by codegen

-fn test_bind_pat() -> () {
+fn test_ident_pat() -> () {
    // A binding pattern. For example:
    match x {
        Some(y) => y,
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
@@ -2,13 +2,13 @@
 import codeql.rust.elements
 import TestUtils

-from LetStmt x, Pat getPat, string hasTypeRef, string hasInitializer, string hasElse
+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.hasTypeRef() then hasTypeRef = "yes" else hasTypeRef = "no") 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, "hasTypeRef:", hasTypeRef, "hasInitializer:", hasInitializer,
-  "hasElse:", hasElse
+select x, "getPat:", getPat, "hasType:", hasType, "hasInitializer:", hasInitializer, "hasElse:",
+  hasElse
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRef.ql
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRef.ql
@@ -4,4 +4,4 @@ import TestUtils

 from LetStmt x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTypeRef()
+select x, x.getType()
--- a/rust/ql/test/extractor-tests/generated/Literal/Literal.ql
+++ b/rust/ql/test/extractor-tests/generated/Literal/Literal.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

-from TypeRef x
+from Literal x
 where toBeTested(x) and not x.isUnknown()
 select x
--- a/rust/ql/test/extractor-tests/generated/LiteralExpr/gen_literal_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/LiteralExpr/gen_literal_expr.rs
@@ -1,6 +1,6 @@
 // generated by codegen

-fn test_literal_expr() -> () {
+fn test_literal() -> () {
    // A literal expression. For example:
    42;
    42.0;
--- a/rust/ql/test/extractor-tests/generated/InlineAsmExpr/InlineAsmExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/InlineAsmExpr/InlineAsmExpr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils

-from InlineAsmExpr x, Expr getExpr
+from LiteralPat x, Expr getExpr
 where
  toBeTested(x) and
  not x.isUnknown() and
--- a/rust/ql/test/extractor-tests/generated/LiteralPat/gen_literal_pat.rs
+++ b/rust/ql/test/extractor-tests/generated/LiteralPat/gen_literal_pat.rs
@@ -1,6 +1,6 @@
 // generated by codegen

-fn test_lit_pat() -> () {
+fn test_literal_pat() -> () {
    // A literal pattern. For example:
    match x {
        42 => "ok",
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils

-from OffsetOfExpr x, TypeRef getContainer, int getNumberOfFields
+from OffsetOfExpr x, Type getContainer, int getNumberOfFields
 where
  toBeTested(x) and
  not x.isUnknown() and
--- a/rust/ql/test/extractor-tests/generated/UnaryOpExpr/UnaryOpExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/UnaryOpExpr/UnaryOpExpr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils

-from UnaryOpExpr x, Expr getExpr, string getOp
+from PrefixExpr x, Expr getExpr, string getOp
 where
  toBeTested(x) and
  not x.isUnknown() and
--- a/rust/ql/test/extractor-tests/generated/UnaryOpExpr/gen_unary_op_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/UnaryOpExpr/gen_unary_op_expr.rs
@@ -1,6 +1,6 @@
 // generated by codegen

-fn test_unary_op_expr() -> () {
+fn test_prefix_expr() -> () {
    // A unary operation expression. For example:
    let x = -42
    let y = !true
--- a/rust/ql/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr.ql
@@ -3,7 +3,7 @@ import codeql.rust.elements
 import TestUtils

 from
-  RecordLitExpr x, string hasPath, int getNumberOfFields, string hasSpread, string hasEllipsis,
+  RecordExpr x, string hasPath, int getNumberOfFields, string hasSpread, string hasEllipsis,
  string isAssigneeExpr
 where
  toBeTested(x) and
--- a/rust/ql/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getField.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getField.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

-from RecordLitExpr x, int index
+from RecordExpr x, int index
 where toBeTested(x) and not x.isUnknown()
 select x, index, x.getField(index)
--- a/rust/ql/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getPath.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getPath.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

-from RecordLitExpr x
+from RecordExpr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getPath()
--- a/rust/ql/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getSpread.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordLitExpr/RecordLitExpr_getSpread.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

-from RecordLitExpr x
+from RecordExpr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getSpread()
--- a/rust/ql/test/extractor-tests/generated/RecordLitExpr/gen_record_lit_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/RecordLitExpr/gen_record_lit_expr.rs
@@ -1,7 +1,7 @@
 // generated by codegen

-fn test_record_lit_expr() -> () {
-    // A record literal expression. For example:
+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;
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils

-from RecordLitField x, string getName, Expr getExpr
+from RecordExprField x, string getName, Expr getExpr
 where
  toBeTested(x) and
  not x.isUnknown() and
--- 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
@@ -0,0 +1,6 @@
+// generated by codegen
+
+fn test_record_expr_field() -> () {
+    // A field in a record expression. For example `a: 1` in:
+    Foo { a: 1, b: 2 };
+}
--- a/rust/ql/test/extractor-tests/generated/RecordLitField/gen_record_lit_field.rs
+++ b/rust/ql/test/extractor-tests/generated/RecordLitField/gen_record_lit_field.rs
@@ -1,6 +0,0 @@
-// generated by codegen
-
-fn test_record_lit_field() -> () {
-    // A field in a record literal. For example `a: 1` in:
-    Foo { a: 1, b: 2 };
-}
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils

-from RecordFieldPat x, string getName, Pat getPat
+from RecordPatField x, string getName, Pat getPat
 where
  toBeTested(x) and
  not x.isUnknown() and
--- 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
@@ -1,6 +1,6 @@
 // generated by codegen

-fn test_record_field_pat() -> () {
+fn test_record_pat_field() -> () {
    // A field in a record pattern. For example `a: 1` in:
    let Foo { a: 1, b: 2 } = foo;
 }
--- a/rust/ql/test/extractor-tests/generated/WildPat/WildPat.ql
+++ b/rust/ql/test/extractor-tests/generated/WildPat/WildPat.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

-from WildPat x
+from Type x
 where toBeTested(x) and not x.isUnknown()
 select x
--- a/rust/ql/test/extractor-tests/generated/TypeRef/gen_type_ref.rs
+++ b/rust/ql/test/extractor-tests/generated/TypeRef/gen_type_ref.rs
@@ -1,6 +1,6 @@
 // generated by codegen

-fn test_type_ref() -> () {
+fn test_type() -> () {
    // The base class for type references.
    let x: i32;
    let y: Vec<i32>;
--- a/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.ql
+++ b/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

-from LiteralExpr x
+from WildcardPat x
 where toBeTested(x) and not x.isUnknown()
 select x
--- a/rust/ql/test/extractor-tests/generated/WildcardPat/gen_wildcard_pat.rs
+++ b/rust/ql/test/extractor-tests/generated/WildcardPat/gen_wildcard_pat.rs
@@ -1,6 +1,6 @@
 // generated by codegen

-fn test_wild_pat() -> () {
+fn test_wildcard_pat() -> () {
    // A wildcard pattern. For example:
    let _ = 42;
 }