Rename Literal, Type, and BinExpr

2025-12-17 01:03:14 +01:00 · 2024-09-13 18:33:55 +02:00
parent ebe1e5e0d2
commit 3fdc49c4cb
76 changed files with 345 additions and 342 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 812d576622151c716ea439746dbdcd8d742badbe2c47cfb2e17750fba1cc256e 812d576622151c716ea439746dbdcd8d742badbe2c47cfb2e17750fba1cc256e
+top.rs d15c72bcdaa924633a725a2324446686e0f4caaa6a4ae759a101ef31174131a5 d15c72bcdaa924633a725a2324446686e0f4caaa6a4ae759a101ef31174131a5
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -107,17 +107,17 @@ impl TrapEntry for RecordPatField {
 }

 #[derive(Debug)]
-pub struct Type {
+pub struct TypeRef {
    pub id: TrapId,
 }

-impl TrapEntry for Type {
+impl TrapEntry for TypeRef {
    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)]);
+        out.add_tuple("type_refs", vec![trap::Arg::Label(id)]);
    }
 }

@@ -170,22 +170,22 @@ impl TrapEntry for BecomeExpr {
 }

 #[derive(Debug)]
-pub struct BinExpr {
+pub struct BinaryExpr {
    pub id: TrapId,
    pub lhs: trap::Label,
    pub rhs: trap::Label,
    pub op: Option<String>,
 }

-impl TrapEntry for BinExpr {
+impl TrapEntry for BinaryExpr {
    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("bin_exprs", vec![trap::Arg::Label(id), self.lhs.into(), self.rhs.into()]);
+        out.add_tuple("binary_exprs", vec![trap::Arg::Label(id), self.lhs.into(), self.rhs.into()]);
        if let Some(v) = self.op {
-            out.add_tuple("bin_expr_ops", vec![trap::Arg::Label(id), v.into()]);
+            out.add_tuple("binary_expr_ops", vec![trap::Arg::Label(id), v.into()]);
        }
    }
 }
@@ -549,17 +549,17 @@ impl TrapEntry for LetStmt {
 }

 #[derive(Debug)]
-pub struct Literal {
+pub struct LiteralExpr {
    pub id: TrapId,
 }

-impl TrapEntry for Literal {
+impl TrapEntry for LiteralExpr {
    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("literals", vec![trap::Arg::Label(id)]);
+        out.add_tuple("literal_exprs", vec![trap::Arg::Label(id)]);
    }
 }

--- a/rust/extractor/src/translate.rs
+++ b/rust/extractor/src/translate.rs
@@ -117,7 +117,7 @@ impl CrateTranslator<'_> {
    ) -> trap::Label {
        match pat {
            ra_ap_hir_def::hir::LiteralOrConst::Literal(_literal) => {
-                let expr = self.trap.emit(generated::Literal { id: TrapId::Star });
+                let expr = self.trap.emit(generated::LiteralExpr { id: TrapId::Star });
                let label = self.trap.emit(generated::LiteralPat {
                    id: TrapId::Star,
                    expr,
@@ -380,7 +380,7 @@ impl CrateTranslator<'_> {
        ret
    }
    fn emit_type_ref(&mut self, _type_ref: &TypeRef) -> trap::Label {
-        self.trap.emit(generated::Type { id: TrapId::Star })
+        self.trap.emit(generated::TypeRef { id: TrapId::Star })
    }
    fn emit_match_arm(
        &mut self,
@@ -743,7 +743,7 @@ impl CrateTranslator<'_> {
                let lhs = self.emit_expr(*lhs, body, source_map);
                let rhs = self.emit_expr(*rhs, body, source_map);
                let op = op.map(|op| format!("{op}"));
-                self.trap.emit(generated::BinExpr {
+                self.trap.emit(generated::BinaryExpr {
                    id: TrapId::Star,
                    lhs,
                    rhs,
@@ -854,7 +854,7 @@ impl CrateTranslator<'_> {
                })
            }
            ra_ap_hir_def::hir::Expr::Literal(_literal) => {
-                self.trap.emit(generated::Literal { id: TrapId::Star })
+                self.trap.emit(generated::LiteralExpr { id: TrapId::Star })
            }
            ra_ap_hir_def::hir::Expr::Underscore => self
                .trap
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -8,8 +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/BinExpr.qll 201798bde3e0f8e2c6b40e1771c8de21c7a962da4c18f69773fb6fb7f59bba36 e8134215b75065bd8acb3d2b11a0c4129615e333a5dac48ab4b588f7463afc3f
-lib/codeql/rust/elements/BinExprConstructor.qll 29d27d66a269ef84a4d6f9ff4785d9aa44225a109886294670828f0e0fa56a35 4da4fec6432c73880eff119a4cc7dbef5816c433a7d25ab3e5818283a0e28944
+lib/codeql/rust/elements/BinaryExpr.qll 2c59bac9aecb4a0a3495b9e2a3294ff9d6aef3204acfcb05d278c10427269e81 e0b99b8be24214d0eed80ce81d38e7770afd1a9d515622d5f1d51a0df1e553ac
+lib/codeql/rust/elements/BinaryExprConstructor.qll 1cae8104dc9860a7e445594465fbffeb7cb73534887d9766eaabe2bda8e62957 3d347cff129b9bbe8b66cee0e55596c02b8c11fe7c78b5a47e11e5c7ac57bbf4
 lib/codeql/rust/elements/BlockExpr.qll b699906fba2dee34699e110b8759419079a5ce3dc1fab207001c9c9b612dac5e 429016df600e3905bd235d0e707c50ecdbf12b3ceddedcbf48944ea76e60f915
 lib/codeql/rust/elements/BlockExprBase.qll 1b24ea5fd43dce0e240e1d7740a062228c19e8c704f6ce26503ddbd65c6f5282 d2e05a51d3840caf4de4cca6cdab9551f396df317c8ad1da661205aa822646cc
 lib/codeql/rust/elements/BlockExprConstructor.qll 7fc9214582f0e6e8b4db06f7c6ac3712dc260abc12ff65f3e93bec5f210b0098 13bc676b67ed14b326e4bdaaa43b497ce486dc2c3145a76a25fe960c82a6ba54
@@ -56,8 +56,8 @@ 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/Literal.qll 5088223cfb4625a191c86f7c45d6b0c3b689f165f84d213e666f25828847b293 c76d8f97ed23b1c8f19d290d5cf367cf6e7820f1c7f7fd3dd6924fcdcd94ad2d
-lib/codeql/rust/elements/LiteralConstructor.qll 6a80cc2175b6f7ceeedab2c06ca7f980ccbf64f6a7dda8c779fc92cecf91f7bc 177eee9c8214f2a776df18fc02754a6685f116aefe00d1444643eea954436739
+lib/codeql/rust/elements/LiteralExpr.qll 031edbbd52d2107a3a7149a4dde306f5fcce9a32b7f4c5f7398b013c06ef37fe 7c18930dc7514f5fbe0a4248242430ee06f403b4e301c4e594355fc5b2fc8941
+lib/codeql/rust/elements/LiteralExprConstructor.qll 1a6aa25d6700ab9c85bd7b721e4818064a3a092386589ecdc2018b8b8c2464dc 6d6b50e2dabfa671110454d64f0903336563ee4be1dc6751071a801ac2fcb8e8
 lib/codeql/rust/elements/LiteralPat.qll 1971f70ba0b872de28e1a168ac63d35afc123c5a710efe83b78e88cf949ff20a 1d00573dcffe4d4cfd444baafed38ec693035057d6b825e76e47d436fd08d02a
 lib/codeql/rust/elements/LiteralPatConstructor.qll abe137b2b8ec9dd9450fc77d2d826fe891bbb0af23b0c26ff5e2d1751988f747 e1642805588737ed98eebec1d16cb0fb9fd081db203ec725db85b02c4837bdcb
 lib/codeql/rust/elements/LoopExpr.qll a32330e9f6c5420e7fbd4a61f53dde892c1acadabef074b7e9aa3beae39617eb 97061b3dd86af3ef271587aa337d10f2a7094cb69d7e339baf13e5a7817e1389
@@ -81,7 +81,7 @@ lib/codeql/rust/elements/OrPatConstructor.qll 9a24cc095adc55ae8ea66f68c695f42de0
 lib/codeql/rust/elements/Pat.qll 79ac8430cc9047cf89fcf80cdb527166bd72e979d03e051fa2d60fa2f64f2294 914362a06ad0cac1e1777874bf4425fcc805021197f635ddd87b96d9e5c221d9
 lib/codeql/rust/elements/Path.qll 3863a424a10b840f05584e17cb642859b18093b205eb9125f9aa0a0c2de6bab3 0db28b1b40218961ff8db478842b54ed7eee7660229113aca93c180aa45bb243
 lib/codeql/rust/elements/PathConstructor.qll 97243db75d6337cf68a22ea68569fdddf4c3bc1b8875bb4bb66faeeba8846a53 03c8c665e2f3b103148fd38eb7a4d0459c8189b2f6160dc08ee1d6d2807e01b6
-lib/codeql/rust/elements/PathExpr.qll 861b1d9e6246588fcb0b6d8560c7807a4209941a8cbc93779b80e494561af706 c6da0b2e8ace1c30a7cd468406353a457440aafacf8e31c32618fd9781c69113
+lib/codeql/rust/elements/PathExpr.qll 088ca8090fc5fde84a3b39549099d1e1150a547ce9294d5d83984c9449fe964d 4e1e692bb6ab8cb887fc3fa0bb251e82f0b68e90e4e2ea68f5704b8b85db33fe
 lib/codeql/rust/elements/PathExprConstructor.qll 9db3d3ad160d897b65b8b8a62f3243f7ff80d8e2d27875b3cd2c2b046fb0f9b6 26c2ba19a04fba61af8aa0cd72602f7b02bf0e1b693ac9cd14c7ff6066412f75
 lib/codeql/rust/elements/PathPat.qll 748a43d1c25c4fd20eaf78f381e4680207557bb696a28d74a9eaa1887bc966c1 186c947b0bbed3111c9bdc564c3ce39432c1a3bbdbb15ebb503629625ffe1dea
 lib/codeql/rust/elements/PathPatConstructor.qll 476a38723c63bbfa2565946725c90f1224ac2c5283fde79bf14dcefce6f500ca e9e9b000cac44851772bd9ca519edc89e8518e89a0930df21af14a69f5b0e864
@@ -116,8 +116,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/Type.qll eac066a4d80006795d420d7000c69389eebe8fe8bfeaaac384a03c1cd829eb51 03549e3b3bbcc89cd8b9f81d30e8b567c846660824aa906fad846d1aa717659a
-lib/codeql/rust/elements/TypeConstructor.qll 10d8f9157d864e1035a1773d8a8355e3b8671b1605377b7a8427ea8625fbba6c 02a2cd28ef2379de6fb70f5e68bbb5ceaf815defea15ed990cec46bb70efdadf
+lib/codeql/rust/elements/TypeRef.qll 13824c88938542cc554bc9ead335136a4eb115ec07ced03e140c9a88f49afdb6 4d265a4fa37a9df406d4bbbad03a69bcb3b5edd3152482fdb90676466283194e
+lib/codeql/rust/elements/TypeRefConstructor.qll f8b2e5ef15517890a8b2d56643f471ae64cc74c420187049e33b182417e72e4f 683611e732b842756e301a77625b385bca0c4969971020c9e11220a1aa665a29
 lib/codeql/rust/elements/UnderscoreExpr.qll bf4c0bf76fa15b041f7ecbd492a499088bef2024b49dbdfa57232e84e72c3067 462380bac5f772c1986146d32b70deabc9f03581675f6e79f7b7f747acfb0bd5
 lib/codeql/rust/elements/UnderscoreExprConstructor.qll ea9f93fa6529ec4e5bf5c4a98959b2e013e83fce4a74ebfc476b10bce2b331b2 bc36b62fd4fec6fb388d82e2af2aafe0099138d54b7672be81e84fc511fdcc8f
 lib/codeql/rust/elements/Unimplemented.qll 8736c0b7ab0a5b558b47cffe579c0e56016de10017235502bbe18a6d81510a8e cdb6135c0065938892fb32020a7041eed103d97c3335cdc1bf837046f80bd8d3
@@ -131,22 +131,22 @@ lib/codeql/rust/elements/YeetExpr.qll 95a15d0ae79b9cad126700c07d5cb7e4e9699e2e5d
 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 e84f037bfcf04c0c38710f5c52b8d4aa842179f024cf19e29e54af775682980c e84f037bfcf04c0c38710f5c52b8d4aa842179f024cf19e29e54af775682980c
+lib/codeql/rust/elements.qll 1d92fc19e7660d9874f0dc26a85a7021aaffa05a4c84dd847a82606e7235b944 1d92fc19e7660d9874f0dc26a85a7021aaffa05a4c84dd847a82606e7235b944
 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/BinExpr.qll 1e50692aa42f5b57b4644a368941b29f5941c7cd753be79be0f79340cda583eb 99ef64567805b97d83d31d55df728be74dab07af8252b9edad74b87bdd5019cf
+lib/codeql/rust/generated/BinaryExpr.qll 688465914b9601decb2181c0f09e93f6763eff35477444c68e38d80d8208ed36 3c0a276e59c55c6d7837c442ea9101c9c4b1a8e0e6695b3966309b5f9019ce0a
 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 8d9fc5a784473c7bd8c76c5f4a3a5eb6912bfe8691205f311cd1008b27ff5b74 e06a16614897df217948840e084474499b05edc6249ba0115d7cde516f98e165
 lib/codeql/rust/generated/BreakExpr.qll d1cc6452044b4f0351380adc9e46dc52279746d0cfa37baefce8e89494b385f1 c129e16ad176f40bbda2fb1e6af800a5bd240f3e0dca6e2fbc23b75e105ca8b9
 lib/codeql/rust/generated/CallExpr.qll 44cc428b1950e0d560a4e2c18136a956dbc3f85c575317cbf10a0cb5b2dded97 1a5d8dfd704b289774d7190ee331858b39563dcbb2c52940b02df4c5c2208637
-lib/codeql/rust/generated/CastExpr.qll bda5ec9c2639325ac6ffc65ef44bad0ce7769a0618925d93e59101c3a7b6b804 a40eba5690369b55f373e2c2d724e19791f7721c50365fa6ce1ac93b387a1ea1
-lib/codeql/rust/generated/ClosureExpr.qll 326e2de4da089a078861f5b67fe1c4f4afb7dc295e983fb13c08ffce1d88e577 7e39547d367be795891668e5fcb8a694689beaee3eae63293af1d7c9c6961875
+lib/codeql/rust/generated/CastExpr.qll c1e44783781539fa064717d360c5340668281eedf325543aaeebc3db67ba1243 db94f17538b220e60ee30bd2313f0dc5642fb6143e6c8609bfcce075efef0520
+lib/codeql/rust/generated/ClosureExpr.qll 43d9ff09c156f1ce000c77bcf5ecc02c8fb569c0ca7f042a1aae9d311e18b13e 07e1461269e1f07144468ef7b64b927f29053fa6de71afef334732c33a797f33
 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,8 +164,8 @@ lib/codeql/rust/generated/IndexExpr.qll a8263fb60cb625712b3ca875076994d9a2879648
 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 5d347ca3dbc1b6801de1b339a7694cf6fb4e4b30731356321ccab865d5ab6599 506c4a9745d0e014c600d23a2eb7862a069902b1ebe79dc5bd346147e3a08bdb
-lib/codeql/rust/generated/Literal.qll 66f362fb7e464f1d1350ce13465b029ae14673c84dd8ba7db1bc66083c3da4e7 66f362fb7e464f1d1350ce13465b029ae14673c84dd8ba7db1bc66083c3da4e7
+lib/codeql/rust/generated/LetStmt.qll fe3513e2ea6191deaee4a237adb97bf968ebf30503f95595da097efa18e871ea 67f80fb6c44d775d1bc97a0305a0bfaec57f652015d1e15a11785f57cb16bb24
+lib/codeql/rust/generated/LiteralExpr.qll 70684629cd017f32c220993f57ee4ebea0b9f6267fb61200e97a14a026a8b0e1 70684629cd017f32c220993f57ee4ebea0b9f6267fb61200e97a14a026a8b0e1
 lib/codeql/rust/generated/LiteralPat.qll 6cb250e374f6c3d2c86aaea6ad7baeaa40ee438b42ac6987d823edb91b757d4c f8cf9ef6bb6cd39d65c6eb905f11f79c65daf3d493e1240c0781be29c3fe9202
 lib/codeql/rust/generated/Locatable.qll 2d2b9a7cf26d6134b1e4a2047dfe99f09deb9231a05047d37b697c11ea91d0d2 dae7e0c66024d7f03a58d71ffef93cf23aeb629d7a21d36901c443fb29ff4d3d
 lib/codeql/rust/generated/LoopExpr.qll ddc646e715dced161b60638ac36a7671b45ddd6245a6876d647916d41495faf1 864be7033c093a8513be05691f772f19f99b606abe510f810af5f004596c0c7c
@@ -175,18 +175,18 @@ lib/codeql/rust/generated/MethodCallExpr.qll 187d28d3869f5b44cca8420948266e8370c
 lib/codeql/rust/generated/MissingExpr.qll 34cb27c927a62cc06b0fe26a085e2658abd5019e549c3e01b8273d99e9a9616f 34bf4cfbf3659b600b4aac121f7c2d6da0b00b61c3002f8fb1d554c11968c748
 lib/codeql/rust/generated/MissingPat.qll 40fa87d446056c7263ef5843fb13fe60b644e169a65697be4ca0b5361a8267ee 40fa87d446056c7263ef5843fb13fe60b644e169a65697be4ca0b5361a8267ee
 lib/codeql/rust/generated/Module.qll c6007444c796654fb48fbe4a4596580f08feec2aac13932043062a170dd73f0b 0560c738dbee3937baf0f2ab661c8e4dacd69eb886635241b1ff90f2c0f4bd67
-lib/codeql/rust/generated/OffsetOfExpr.qll 5f2c1d2b5d63d2a86c02c8a20fede528403f8dd267f3026ddc420e128f53c73c d4a7eb9e533a943913aa3bdc6f57d89023a0a2075681b6aaa53d5c4dd7ad764b
+lib/codeql/rust/generated/OffsetOfExpr.qll 03afe5637df806f4649fb2c67fdc4f048a2faab47f00e8320f85025d4a2fa933 4e5c0c98b0397f1388ac0c27ea415f594ebd591e980dd70590ed043856beb156
 lib/codeql/rust/generated/OrPat.qll 52e637c652f8caf64d2388a1829159d187d3799384cc3318e07785f518ff0c4b 598a11d067519bb7bb279d8f8a3ea85a48ae99c2974182636c157ba111b9605e
-lib/codeql/rust/generated/ParentChild.qll 8ab9e1929ef96817cee929c9c66b6d71bbfb3e5c5f9e44152850e0e9a1ebf29a bca5dd83c47ae5fb7b24e49cabec4d01a59213344b9578bad5d35880ba60a2ff
+lib/codeql/rust/generated/ParentChild.qll 98033de64e7d2db6f3574e0220aad773d04170aed7bf2b97ed4d97278f5837c5 5d9cd7f051f89df726af0fad1ccf8e2a456def82418397155a33858c58962364
 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/PathExpr.qll c27d872e3351d92f8f105c6a4ae2f8f447209a4a139e00576986e641340d9e7d bb5bd1fed0d5caeac3c14d57ca8ee5d3ece8938aab753d488ff475bda8393229
 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 4b2faf8b23ff72bb606378893aa9235861e5f35cd69f4f49893e5832ac9fd454 b9144c583f9bd0cb6110d52e3ccc6d5559de735e5d0a0075e8a4ad8ca8f48848
+lib/codeql/rust/generated/Raw.qll 358a5b315ed73e67446de7d4c32a6430832fa7cbf62f2be3ee0100c494ff3764 6b9628a5e9a8d6d953f87d332520652654292932225abc4d60c6a1dba1cd369c
 lib/codeql/rust/generated/RecordExpr.qll bdafc10cde139617b67cb46bb205f99bc3fc0b9fd8634d304b81b524b9592aa8 2826c453c72416237467b08cf9ad9421b03203a8593420146dad8e1e71711b8a
 lib/codeql/rust/generated/RecordExprField.qll eb06236fbdb856169dfe50ae1ebf59384222de6670ca91c34eed647823dda4ce 750bc7ab1e156db3927d6dd206e9d2c9388519425c0e8665afd322a6594aa5e2
 lib/codeql/rust/generated/RecordPat.qll 20b62cfd4ee4e911ad4a2b8e5762da2abb7ff0c1d7f21cc6f72b1ebcbebbcd42 c0502e6bfc637058524cf7369c63396ca5440c58e5e91600fecd35ca5299d86c
@@ -197,12 +197,12 @@ lib/codeql/rust/generated/RepeatExpr.qll 5a33101a5e2ba973beafe0d933ad5ca238050eb
 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 c47c641625abd6c964dd75d35e4906292ec015458dc6294018f7db75b2891987 1e54a00ef3e83299e36c9ff6cefcae8258c3ca9b5e7440f576f837920ce69c09
-lib/codeql/rust/generated/SynthConstructors.qll 38a59a0baffdf538c363f80680e6647e0096a78dda515054a031959856975752 38a59a0baffdf538c363f80680e6647e0096a78dda515054a031959856975752
+lib/codeql/rust/generated/Synth.qll 69415291e37195836bcc6810cccfdbacad4e1528bb125e26d2cc6b53daf1666b 6c79ab425ea2e132a2bc0eeea4f9f62cf3e259e911deb0c02c9fbdd56957e291
+lib/codeql/rust/generated/SynthConstructors.qll ff41f7bac5ae52e0eb4db378ddd389d65209d927046743852071650b86b4066a ff41f7bac5ae52e0eb4db378ddd389d65209d927046743852071650b86b4066a
 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/Type.qll abe5ef4f20ca98dfc300fdae2ecbf37faf70381feab4e2df4f2b39b193a4cc5f abe5ef4f20ca98dfc300fdae2ecbf37faf70381feab4e2df4f2b39b193a4cc5f
+lib/codeql/rust/generated/TypeRef.qll 62cda2a3bd01a8c8356f11e5deb38ead4a8af630df27d88b8f60b5458d263527 62cda2a3bd01a8c8356f11e5deb38ead4a8af630df27d88b8f60b5458d263527
 lib/codeql/rust/generated/UnderscoreExpr.qll 964b77ddae265ad51fd03fcb7ef008fcb34eb5ea1a7ac0cd06ed84c1922fc07f 964b77ddae265ad51fd03fcb7ef008fcb34eb5ea1a7ac0cd06ed84c1922fc07f
 lib/codeql/rust/generated/Unimplemented.qll bcf63c2be3e0f7b88704a76ed182616101cd4b317f539ef5a65e5a4b87fb6b39 0e3e0ba85e03f327334b752c1dd1aa82b71bf1601725fcc071d93a29e40e1188
 lib/codeql/rust/generated/UnimplementedDeclaration.qll a6eb4e61be018288304be010e063b68039a97f2cfe19e7049d3d54c65c88e9ab 662da5c38f5907d1f0f9990caca2114bf5e3b179591104dde777ae67262815df
@@ -216,8 +216,8 @@ test/extractor-tests/generated/AsyncBlockExpr/AsyncBlockExpr_getStatement.ql de0
 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/BinExpr/BinExpr.ql bb749e937074759573200bbb343398b6f4ecabb35fb3b35f8adcddadb0266c21 5e0b4d8d200ec43345775da8daa173ef79934d0e8259174823ba019fbc36db7d
-test/extractor-tests/generated/BinExpr/BinExpr_getOp.ql b50642b0c85f18bc96ef26f13251a3a34ef5bde2007092194324023c447446b2 8cfeba7f4bb76db88db4c4524f1840905f8c77a97212110dface353cfd6e2a11
+test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql 3db360cb56d154f060175aceb5d14b14f51855b6b28ef3d67fb76b20ad239c01 4f4ff1915cc7f705d1ab5d6e507b28989f7ea19a7f76fc5ae6fb9dc11b31fcda
+test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql 44e0664654d91130933e9c17909dc780866dc6e63b241079751f0356b8951ab9 97032408c8efea44a635b487365ada5d0564ec34c9d79901b6bc64c43a4962a6
 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
@@ -229,7 +229,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 302ed396ea5889cfb7d36d307055cb81965534c55ea00a8dcc2a4949de1f230b a32fd4ef4f6d0410a8d57a150d5bec8bc0df9aaf8fbab74d17b52a0665e7c488
+test/extractor-tests/generated/CastExpr/CastExpr.ql 6028e49e8788d424ac83f7e70aca394c72834789d61517a26b9d6901f40ef734 a3fe7712c8d97fee8aa7505c3a2be03f296f8032207a24dd44f6dd91a463a068
 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,7 +255,7 @@ test/extractor-tests/generated/LetStmt/LetStmt.ql 842f58d8d744a567c44bf3742e4a91
 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_getType.ql 3326644b606a846afbd2eaf8ed4223eadb0061e23e953d085d2a3df0935ef534 c414e5a1f927779249a26c370ba07c82c99d489cb65f984003674b288a690109
-test/extractor-tests/generated/Literal/Literal.ql fac18e7ec3d9a78223be0de6f318eb93e9986fd7cb353a68fa853c96db4bd0b9 048ad873316f227ea289533d2bb6f4bafab4625f270b109e29dde28b0c3828e6
+test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql 9fb9c6336d1e3a657d988ffb53a43ce66b8403e46bea05d73d546ae774a647bc 708e2878eca3e9661e8b0d54180b4a6f512d9233178e9ad5683a1f72fa9656aa
 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
@@ -270,7 +270,7 @@ 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 cff3a4a196eeee98e812ae7c8bbab4a381cc3f0462566b699fd7011e84925476 60c002bb0686b853e72b12f092433ab6f5ada0f556629e0711ce8b23b260fa89
+test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql 579e667797cb071784fa4c8e4e79bffd8b7a797bc70a68054ab51950dbebf4f0 dd92801d8909d83be1f824a2dfc599551c11b63ad1e96593e22d3b43464d7cf1
 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
@@ -311,7 +311,7 @@ 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/Type/Type.ql e4e62ad1209870ec39455fbcf3b2e6fcb8c46e7b6fed9b9054cc4a7c0999529d 42ee022e1811b81fb3912fef9f6b55b15fc2ed99f3e48d2a8ca9375c7c6d71bd
+test/extractor-tests/generated/TypeRef/TypeRef.ql 73283955206c7e1ef71009969826e34c7f37624547c2ef39c80a23583cb37216 fedf7995b69805ce7ccc4e29aa592043cff2f7ac6730a70d27ed883d922b4684
 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
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -10,8 +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/BinExpr.qll linguist-generated
-/lib/codeql/rust/elements/BinExprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/BinaryExpr.qll linguist-generated
+/lib/codeql/rust/elements/BinaryExprConstructor.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
@@ -58,8 +58,8 @@
 /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/Literal.qll linguist-generated
-/lib/codeql/rust/elements/LiteralConstructor.qll linguist-generated
+/lib/codeql/rust/elements/LiteralExpr.qll linguist-generated
+/lib/codeql/rust/elements/LiteralExprConstructor.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
@@ -118,8 +118,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/Type.qll linguist-generated
-/lib/codeql/rust/elements/TypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/TypeRef.qll linguist-generated
+/lib/codeql/rust/elements/TypeRefConstructor.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
@@ -140,7 +140,7 @@
 /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/BinExpr.qll linguist-generated
+/lib/codeql/rust/generated/BinaryExpr.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
@@ -167,7 +167,7 @@
 /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/Literal.qll linguist-generated
+/lib/codeql/rust/generated/LiteralExpr.qll linguist-generated
 /lib/codeql/rust/generated/LiteralPat.qll linguist-generated
 /lib/codeql/rust/generated/Locatable.qll linguist-generated
 /lib/codeql/rust/generated/LoopExpr.qll linguist-generated
@@ -204,7 +204,7 @@
 /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/Type.qll linguist-generated
+/lib/codeql/rust/generated/TypeRef.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
@@ -218,8 +218,8 @@
 /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/BinExpr/BinExpr.ql linguist-generated
-/test/extractor-tests/generated/BinExpr/BinExpr_getOp.ql linguist-generated
+/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql linguist-generated
+/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql linguist-generated
 /test/extractor-tests/generated/BlockExpr/BlockExpr.ql linguist-generated
 /test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.ql linguist-generated
 /test/extractor-tests/generated/BlockExpr/BlockExpr_getStatement.ql linguist-generated
@@ -257,7 +257,7 @@
 /test/extractor-tests/generated/LetStmt/LetStmt_getElse.ql linguist-generated
 /test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql linguist-generated
 /test/extractor-tests/generated/LetStmt/LetStmt_getType.ql linguist-generated
-/test/extractor-tests/generated/Literal/Literal.ql linguist-generated
+/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql linguist-generated
 /test/extractor-tests/generated/LiteralPat/LiteralPat.ql linguist-generated
 /test/extractor-tests/generated/LoopExpr/LoopExpr.ql linguist-generated
 /test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql linguist-generated
@@ -313,7 +313,7 @@
 /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/Type/Type.ql linguist-generated
+/test/extractor-tests/generated/TypeRef/TypeRef.ql linguist-generated
 /test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql linguist-generated
 /test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr.ql linguist-generated
 /test/extractor-tests/generated/UnsafeBlockExpr/UnsafeBlockExpr_getStatement.ql linguist-generated
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -9,7 +9,7 @@ import codeql.rust.elements.AstNode
 import codeql.rust.elements.AsyncBlockExpr
 import codeql.rust.elements.AwaitExpr
 import codeql.rust.elements.BecomeExpr
-import codeql.rust.elements.BinExpr
+import codeql.rust.elements.BinaryExpr
 import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.BlockExprBase
 import codeql.rust.elements.BoxExpr
@@ -36,7 +36,7 @@ import codeql.rust.elements.ItemStmt
 import codeql.rust.elements.Label
 import codeql.rust.elements.LetExpr
 import codeql.rust.elements.LetStmt
-import codeql.rust.elements.Literal
+import codeql.rust.elements.LiteralExpr
 import codeql.rust.elements.LiteralPat
 import codeql.rust.elements.Locatable
 import codeql.rust.elements.LoopExpr
@@ -68,7 +68,7 @@ import codeql.rust.elements.Stmt
 import codeql.rust.elements.TupleExpr
 import codeql.rust.elements.TuplePat
 import codeql.rust.elements.TupleStructPat
-import codeql.rust.elements.Type
+import codeql.rust.elements.TypeRef
 import codeql.rust.elements.UnderscoreExpr
 import codeql.rust.elements.Unimplemented
 import codeql.rust.elements.UnimplementedDeclaration
--- a/rust/ql/lib/codeql/rust/elements/BinaryExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BinaryExpr.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 `BinExpr`.
+ * This module provides a hand-modifiable wrapper around the generated class `BinaryExpr`.
 */

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

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

 private import codeql.rust.generated.Raw

 /**
- *  The characteristic predicate of `Type` synthesized instances.
+ *  The characteristic predicate of `BinaryExpr` synthesized instances.
 *  INTERNAL: Do not use.
 */
-predicate constructType(Raw::Type id) { any() }
+predicate constructBinaryExpr(Raw::BinaryExpr 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 `Literal`.
+ * This module provides a hand-modifiable wrapper around the generated class `LiteralExpr`.
 */

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

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

 private import codeql.rust.generated.Raw

 /**
- *  The characteristic predicate of `Literal` synthesized instances.
+ *  The characteristic predicate of `LiteralExpr` synthesized instances.
 *  INTERNAL: Do not use.
 */
-predicate constructLiteral(Raw::Literal id) { any() }
+predicate constructLiteralExpr(Raw::LiteralExpr id) { any() }
--- a/rust/ql/lib/codeql/rust/elements/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
@@ -11,7 +11,7 @@ private import codeql.rust.generated.PathExpr
 * let x = variable;
 * let x = foo::bar;
 * let y = <T>::foo;
- * let z = <Type as Trait>::foo;
+ * let z = <TypeRef as Trait>::foo;
 * ```
 */
 class PathExpr extends Generated::PathExpr { }
--- 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 `Type`.
+ * This module provides a hand-modifiable wrapper around the generated class `TypeRef`.
 */

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

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

 private import codeql.rust.generated.Raw

 /**
- *  The characteristic predicate of `BinExpr` synthesized instances.
+ *  The characteristic predicate of `TypeRef` synthesized instances.
 *  INTERNAL: Do not use.
 */
-predicate constructBinExpr(Raw::BinExpr id) { any() }
+predicate constructTypeRef(Raw::TypeRef id) { any() }
--- a/rust/ql/lib/codeql/rust/generated/BinExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/BinExpr.qll
@@ -1,55 +0,0 @@
-// 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/BinaryExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/BinaryExpr.qll
@@ -0,0 +1,57 @@
+// generated by codegen
+/**
+ * This module provides the generated definition of `BinaryExpr`.
+ * 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 `BinaryExpr` 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::BinaryExpr` class directly.
+   * Use the subclass `BinaryExpr`, where the following predicates are available.
+   */
+  class BinaryExpr extends Synth::TBinaryExpr, Expr {
+    override string getAPrimaryQlClass() { result = "BinaryExpr" }
+
+    /**
+     * Gets the lhs of this binary expression.
+     */
+    Expr getLhs() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertBinaryExprToRaw(this).(Raw::BinaryExpr).getLhs())
+    }
+
+    /**
+     * Gets the rhs of this binary expression.
+     */
+    Expr getRhs() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertBinaryExprToRaw(this).(Raw::BinaryExpr).getRhs())
+    }
+
+    /**
+     * Gets the op of this binary expression, if it exists.
+     */
+    string getOp() { result = Synth::convertBinaryExprToRaw(this).(Raw::BinaryExpr).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.Type
+import codeql.rust.elements.TypeRef

 /**
 * INTERNAL: This module contains the fully generated definition of `CastExpr` and should not
@@ -36,9 +36,9 @@ module Generated {
    /**
     * Gets the type of this cast expression.
     */
-    Type getType() {
+    TypeRef getType() {
      result =
-        Synth::convertTypeFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getType())
+        Synth::convertTypeRefFromRaw(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.Type
+import codeql.rust.elements.TypeRef

 /**
 * 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.
     */
-    Type getArgType(int index) {
+    TypeRef getArgType(int index) {
      result =
-        Synth::convertTypeFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertTypeRefFromRaw(Synth::convertClosureExprToRaw(this)
              .(Raw::ClosureExpr)
              .getArgType(index))
    }
@@ -70,14 +70,14 @@ module Generated {
    /**
     * Gets any of the argument types of this closure expression.
     */
-    final Type getAnArgType() { result = this.getArgType(_) }
+    final TypeRef getAnArgType() { result = this.getArgType(_) }

    /**
     * Gets the ret type of this closure expression, if it exists.
     */
-    Type getRetType() {
+    TypeRef getRetType() {
      result =
-        Synth::convertTypeFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertTypeRefFromRaw(Synth::convertClosureExprToRaw(this)
              .(Raw::ClosureExpr)
              .getRetType())
    }
--- 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.Type
+import codeql.rust.elements.TypeRef

 /**
 * INTERNAL: This module contains the fully generated definition of `LetStmt` and should not
@@ -43,8 +43,9 @@ module Generated {
    /**
     * Gets the type of this let statement, if it exists.
     */
-    Type getType() {
-      result = Synth::convertTypeFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getType())
+    TypeRef getType() {
+      result =
+        Synth::convertTypeRefFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getType())
    }

    /**
--- 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 `Literal`.
+ * This module provides the generated definition of `LiteralExpr`.
 * 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 `Literal` and should not
+ * INTERNAL: This module contains the fully generated definition of `LiteralExpr` 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::Literal` class directly.
-   * Use the subclass `Literal`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::LiteralExpr` class directly.
+   * Use the subclass `LiteralExpr`, where the following predicates are available.
   */
-  class Literal extends Synth::TLiteral, Expr {
-    override string getAPrimaryQlClass() { result = "Literal" }
+  class LiteralExpr extends Synth::TLiteralExpr, Expr {
+    override string getAPrimaryQlClass() { result = "LiteralExpr" }
  }
 }
--- 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.Type
+import codeql.rust.elements.TypeRef

 /**
 * 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.
     */
-    Type getContainer() {
+    TypeRef getContainer() {
      result =
-        Synth::convertTypeFromRaw(Synth::convertOffsetOfExprToRaw(this)
+        Synth::convertTypeRefFromRaw(Synth::convertOffsetOfExprToRaw(this)
              .(Raw::OffsetOfExpr)
              .getContainer())
    }
--- a/rust/ql/lib/codeql/rust/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/generated/ParentChild.qll
@@ -212,7 +212,7 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfType(Type e, int index, string partialPredicateCall) {
+  private Element getImmediateChildOfTypeRef(TypeRef 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
@@ -290,7 +290,7 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfBinExpr(BinExpr e, int index, string partialPredicateCall) {
+  private Element getImmediateChildOfBinaryExpr(BinaryExpr 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
@@ -665,7 +665,9 @@ private module Impl {
    )
  }

-  private Element getImmediateChildOfLiteral(Literal e, int index, string partialPredicateCall) {
+  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
@@ -1284,7 +1286,7 @@ private module Impl {
    or
    result = getImmediateChildOfRecordPatField(e, index, partialAccessor)
    or
-    result = getImmediateChildOfType(e, index, partialAccessor)
+    result = getImmediateChildOfTypeRef(e, index, partialAccessor)
    or
    result = getImmediateChildOfAsmExpr(e, index, partialAccessor)
    or
@@ -1292,7 +1294,7 @@ private module Impl {
    or
    result = getImmediateChildOfBecomeExpr(e, index, partialAccessor)
    or
-    result = getImmediateChildOfBinExpr(e, index, partialAccessor)
+    result = getImmediateChildOfBinaryExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfBoxExpr(e, index, partialAccessor)
    or
@@ -1330,7 +1332,7 @@ private module Impl {
    or
    result = getImmediateChildOfLetStmt(e, index, partialAccessor)
    or
-    result = getImmediateChildOfLiteral(e, index, partialAccessor)
+    result = getImmediateChildOfLiteralExpr(e, index, partialAccessor)
    or
    result = getImmediateChildOfLiteralPat(e, index, partialAccessor)
    or
--- a/rust/ql/lib/codeql/rust/generated/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/generated/PathExpr.qll
@@ -20,7 +20,7 @@ module Generated {
   * let x = variable;
   * let x = foo::bar;
   * let y = <T>::foo;
-   * let z = <Type as Trait>::foo;
+   * let z = <TypeRef as Trait>::foo;
   * ```
   * INTERNAL: Do not reference the `Generated::PathExpr` class directly.
   * Use the subclass `PathExpr`, where the following predicates are available.
--- a/rust/ql/lib/codeql/rust/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/generated/Raw.qll
@@ -177,8 +177,8 @@ module Raw {
   * let z: Option<i32>;
   * ```
   */
-  class Type extends @type, AstNode, Unimplemented {
-    override string toString() { result = "Type" }
+  class TypeRef extends @type_ref, AstNode, Unimplemented {
+    override string toString() { result = "TypeRef" }
  }

  /**
@@ -260,23 +260,23 @@ module Raw {
   * x += y;
   * ```
   */
-  class BinExpr extends @bin_expr, Expr {
-    override string toString() { result = "BinExpr" }
+  class BinaryExpr extends @binary_expr, Expr {
+    override string toString() { result = "BinaryExpr" }

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

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

    /**
-     * Gets the op of this bin expression, if it exists.
+     * Gets the op of this binary expression, if it exists.
     */
-    string getOp() { bin_expr_ops(this, result) }
+    string getOp() { binary_expr_ops(this, result) }
  }

  /**
@@ -408,7 +408,7 @@ module Raw {
    /**
     * Gets the type of this cast expression.
     */
-    Type getType() { cast_exprs(this, _, result) }
+    TypeRef getType() { cast_exprs(this, _, result) }
  }

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

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

    /**
     * Gets the body of this closure expression.
@@ -746,7 +746,7 @@ module Raw {
    /**
     * Gets the type of this let statement, if it exists.
     */
-    Type getType() { let_stmt_types(this, result) }
+    TypeRef getType() { let_stmt_types(this, result) }

    /**
     * Gets the initializer of this let statement, if it exists.
@@ -772,8 +772,8 @@ module Raw {
   * r"Hello, world!";
   * true;
   */
-  class Literal extends @literal, Expr {
-    override string toString() { result = "Literal" }
+  class LiteralExpr extends @literal_expr, Expr {
+    override string toString() { result = "LiteralExpr" }
  }

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

    /**
     * Gets the `index`th field of this offset of expression (0-based).
@@ -987,7 +987,7 @@ module Raw {
   * let x = variable;
   * let x = foo::bar;
   * let y = <T>::foo;
-   * let z = <Type as Trait>::foo;
+   * let z = <TypeRef as Trait>::foo;
   * ```
   */
  class PathExpr extends @path_expr, Expr {
--- a/rust/ql/lib/codeql/rust/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/generated/Synth.qll
@@ -34,7 +34,7 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TBinExpr(Raw::BinExpr id) { constructBinExpr(id) } or
+    TBinaryExpr(Raw::BinaryExpr id) { constructBinaryExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -126,7 +126,7 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TLiteral(Raw::Literal id) { constructLiteral(id) } or
+    TLiteralExpr(Raw::LiteralExpr id) { constructLiteralExpr(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -242,7 +242,7 @@ module Synth {
    /**
     * INTERNAL: Do not use.
     */
-    TType(Raw::Type id) { constructType(id) } or
+    TTypeRef(Raw::TypeRef id) { constructTypeRef(id) } or
    /**
     * INTERNAL: Do not use.
     */
@@ -280,7 +280,7 @@ module Synth {
   */
  class TAstNode =
    TDeclaration or TExpr or TGenericArgList or TLabel or TMatchArm or TPat or TPath or
-        TRecordExprField or TRecordPatField or TStmt or TType;
+        TRecordExprField or TRecordPatField or TStmt or TTypeRef;

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

  /**
   * INTERNAL: Do not use.
@@ -324,7 +324,7 @@ module Synth {
  /**
   * INTERNAL: Do not use.
   */
-  class TUnimplemented = TGenericArgList or TPath or TType or TUnimplementedDeclaration;
+  class TUnimplemented = TGenericArgList or TPath or TTypeRef or TUnimplementedDeclaration;

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

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

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

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

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

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

  /**
   * INTERNAL: Do not use.
@@ -806,7 +806,7 @@ module Synth {
    or
    result = convertStmtFromRaw(e)
    or
-    result = convertTypeFromRaw(e)
+    result = convertTypeRefFromRaw(e)
  }

  /**
@@ -860,7 +860,7 @@ module Synth {
    or
    result = convertBecomeExprFromRaw(e)
    or
-    result = convertBinExprFromRaw(e)
+    result = convertBinaryExprFromRaw(e)
    or
    result = convertBlockExprBaseFromRaw(e)
    or
@@ -886,7 +886,7 @@ module Synth {
    or
    result = convertLetExprFromRaw(e)
    or
-    result = convertLiteralFromRaw(e)
+    result = convertLiteralExprFromRaw(e)
    or
    result = convertLoopExprFromRaw(e)
    or
@@ -984,7 +984,7 @@ module Synth {
    or
    result = convertPathFromRaw(e)
    or
-    result = convertTypeFromRaw(e)
+    result = convertTypeRefFromRaw(e)
    or
    result = convertUnimplementedDeclarationFromRaw(e)
  }
@@ -1019,10 +1019,10 @@ module Synth {

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

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

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

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

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

  /**
   * INTERNAL: Do not use.
@@ -1469,7 +1469,7 @@ module Synth {
    or
    result = convertStmtToRaw(e)
    or
-    result = convertTypeToRaw(e)
+    result = convertTypeRefToRaw(e)
  }

  /**
@@ -1523,7 +1523,7 @@ module Synth {
    or
    result = convertBecomeExprToRaw(e)
    or
-    result = convertBinExprToRaw(e)
+    result = convertBinaryExprToRaw(e)
    or
    result = convertBlockExprBaseToRaw(e)
    or
@@ -1549,7 +1549,7 @@ module Synth {
    or
    result = convertLetExprToRaw(e)
    or
-    result = convertLiteralToRaw(e)
+    result = convertLiteralExprToRaw(e)
    or
    result = convertLoopExprToRaw(e)
    or
@@ -1647,7 +1647,7 @@ module Synth {
    or
    result = convertPathToRaw(e)
    or
-    result = convertTypeToRaw(e)
+    result = convertTypeRefToRaw(e)
    or
    result = convertUnimplementedDeclarationToRaw(e)
  }
--- a/rust/ql/lib/codeql/rust/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/generated/SynthConstructors.qll
@@ -7,7 +7,7 @@ import codeql.rust.elements.AsmExprConstructor
 import codeql.rust.elements.AsyncBlockExprConstructor
 import codeql.rust.elements.AwaitExprConstructor
 import codeql.rust.elements.BecomeExprConstructor
-import codeql.rust.elements.BinExprConstructor
+import codeql.rust.elements.BinaryExprConstructor
 import codeql.rust.elements.BlockExprConstructor
 import codeql.rust.elements.BoxExprConstructor
 import codeql.rust.elements.BoxPatConstructor
@@ -30,7 +30,7 @@ import codeql.rust.elements.ItemStmtConstructor
 import codeql.rust.elements.LabelConstructor
 import codeql.rust.elements.LetExprConstructor
 import codeql.rust.elements.LetStmtConstructor
-import codeql.rust.elements.LiteralConstructor
+import codeql.rust.elements.LiteralExprConstructor
 import codeql.rust.elements.LiteralPatConstructor
 import codeql.rust.elements.LoopExprConstructor
 import codeql.rust.elements.MatchArmConstructor
@@ -59,7 +59,7 @@ import codeql.rust.elements.SlicePatConstructor
 import codeql.rust.elements.TupleExprConstructor
 import codeql.rust.elements.TuplePatConstructor
 import codeql.rust.elements.TupleStructPatConstructor
-import codeql.rust.elements.TypeConstructor
+import codeql.rust.elements.TypeRefConstructor
 import codeql.rust.elements.UnderscoreExprConstructor
 import codeql.rust.elements.UnimplementedDeclarationConstructor
 import codeql.rust.elements.UnsafeBlockExprConstructor
--- 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 `Type`.
+ * This module provides the generated definition of `TypeRef`.
 * 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 `Type` and should not
+ * INTERNAL: This module contains the fully generated definition of `TypeRef` 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::Type` class directly.
-   * Use the subclass `Type`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::TypeRef` class directly.
+   * Use the subclass `TypeRef`, where the following predicates are available.
   */
-  class Type extends Synth::TType, AstNode, Unimplemented {
-    override string getAPrimaryQlClass() { result = "Type" }
+  class TypeRef extends Synth::TTypeRef, AstNode, Unimplemented {
+    override string getAPrimaryQlClass() { result = "TypeRef" }
  }
 }
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -131,7 +131,7 @@ locatable_locations(
@unimplemented =
  @generic_arg_list
 | @path
-| @type
+| @type_ref
 | @unimplemented_declaration
 ;

@@ -146,7 +146,7 @@ locatable_locations(
 | @record_expr_field
 | @record_pat_field
 | @stmt
-| @type
+| @type_ref
 ;

@declaration =
@@ -160,7 +160,7 @@ locatable_locations(
 | @asm_expr
 | @await_expr
 | @become_expr
-| @bin_expr
+| @binary_expr
 | @block_expr_base
 | @box_expr
 | @break_expr
@@ -173,7 +173,7 @@ locatable_locations(
 | @if_expr
 | @index_expr
 | @let_expr
-| @literal
+| @literal_expr
 | @loop_expr
 | @match_expr
 | @method_call_expr
@@ -251,8 +251,8 @@ record_pat_fields(
 | @let_stmt
 ;

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

@array_expr =
@@ -275,15 +275,15 @@ become_exprs(
  int expr: @expr ref
 );

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

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

@@ -352,7 +352,7 @@ call_expr_is_assignee_expr(
 cast_exprs(
  unique int id: @cast_expr,
  int expr: @expr ref,
-  int type_: @type ref
+  int type_: @type_ref ref
 );

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

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

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

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

-literals(
-  unique int id: @literal
+literal_exprs(
+  unique int id: @literal_expr
 );

 literal_pats(
@@ -567,7 +567,7 @@ module_declarations(

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

 #keyset[id, index]
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -2,7 +2,7 @@ AsmExpr/gen_asm_expr.rs 98d1a2525501416434a087b3791268691e5420f122f6e4d6d868a427
 AsyncBlockExpr/gen_async_block_expr.rs 63b31fbeeead710902aa31184c06e88e604a1b7ff3308aba52b5d6a965870ff6 63b31fbeeead710902aa31184c06e88e604a1b7ff3308aba52b5d6a965870ff6
 AwaitExpr/gen_await_expr.rs 09632657a74dda663c217b0e16d7f1b33f7f49efb2ef480c0d2cc9c66b65202b 09632657a74dda663c217b0e16d7f1b33f7f49efb2ef480c0d2cc9c66b65202b
 BecomeExpr/gen_become_expr.rs 15f42386c7362b50d8bcefda432167104e537fa63f038c1ab016f75a171f728c 15f42386c7362b50d8bcefda432167104e537fa63f038c1ab016f75a171f728c
-BinExpr/gen_bin_expr.rs fcfdfa8cc35f12c9a1114cdbc00b06e9759abae9ee8a4a3fed19f979dc6fed4d fcfdfa8cc35f12c9a1114cdbc00b06e9759abae9ee8a4a3fed19f979dc6fed4d
+BinaryExpr/gen_binary_expr.rs f763732714ef056e9d8aaaab69398c37dffdcf96eaf63e9f35d27e7868d78863 f763732714ef056e9d8aaaab69398c37dffdcf96eaf63e9f35d27e7868d78863
 BlockExpr/gen_block_expr.rs b09aa0406d2e772bc14bb1be4959ac21ebaf75c65a1d9f92bb3d8be5fd571023 b09aa0406d2e772bc14bb1be4959ac21ebaf75c65a1d9f92bb3d8be5fd571023
 BoxExpr/gen_box_expr.rs f4392a8e9daae2492c087fc8f7323f45ffbdb43a4ae5035be61e6edeaf427f23 f4392a8e9daae2492c087fc8f7323f45ffbdb43a4ae5035be61e6edeaf427f23
 BoxPat/gen_box_pat.rs 4f6c7ea95d49a350bcfe8bc381229b89c08eb44580d98c853cf6b2ab6649b3a6 4f6c7ea95d49a350bcfe8bc381229b89c08eb44580d98c853cf6b2ab6649b3a6
@@ -24,7 +24,7 @@ IndexExpr/gen_index_expr.rs b1a1b9eadd40ac1652d944dc925337435ef5782bf485a0f0360c
 Label/gen_label.rs 463ae5ff89ef1222896d7c2009fb8ae7f437c51bc767415e37f6a50b76b9edbd 463ae5ff89ef1222896d7c2009fb8ae7f437c51bc767415e37f6a50b76b9edbd
 LetExpr/gen_let_expr.rs 83e9726f3f14fb9d3d332462230fc939f0214216997f5ca84f58518ffd65653d 83e9726f3f14fb9d3d332462230fc939f0214216997f5ca84f58518ffd65653d
 LetStmt/gen_let_stmt.rs d22098db07cbdd4e4616c24bc9738f989e553336c7ce1a5391e1b403adb10dbb d22098db07cbdd4e4616c24bc9738f989e553336c7ce1a5391e1b403adb10dbb
-Literal/gen_literal.rs 5d0091bb686fb8d9b9115f9bb7a66d4d79dde7b0d66cc8e4df2ef00adaed25f1 5d0091bb686fb8d9b9115f9bb7a66d4d79dde7b0d66cc8e4df2ef00adaed25f1
+LiteralExpr/gen_literal_expr.rs 302ebc81012fd46ccf8d960fe6ae691747bdec1c7cd52b0d47ed1273b4d8dc3a 302ebc81012fd46ccf8d960fe6ae691747bdec1c7cd52b0d47ed1273b4d8dc3a
 LiteralPat/gen_literal_pat.rs b97dfb678d9e78d8b1673862e6d88593cfccb648fd5915a5849eb20fdc5d2165 b97dfb678d9e78d8b1673862e6d88593cfccb648fd5915a5849eb20fdc5d2165
 LoopExpr/gen_loop_expr.rs 0a7e6dd7690fae82495c466f8a175b3a4097478041ec0e0bc0b7db97d2e50e66 0a7e6dd7690fae82495c466f8a175b3a4097478041ec0e0bc0b7db97d2e50e66
 MatchArm/gen_match_arm.rs cad136c0d9ffd9fb4250e1e26ccaa7a2920b614d004c25296b819b8d33e87cf9 cad136c0d9ffd9fb4250e1e26ccaa7a2920b614d004c25296b819b8d33e87cf9
@@ -36,7 +36,7 @@ Module/gen_module.rs 6ef553f0782cacf198efe10885a7784e208bbe8da27a65f7f004b49581a
 OffsetOfExpr/gen_offset_of_expr.rs 3744346b0e37fd18193f41e45b74ba9a5dca8ae3dc6a30381272358e6ec8e495 3744346b0e37fd18193f41e45b74ba9a5dca8ae3dc6a30381272358e6ec8e495
 OrPat/gen_or_pat.rs 5b27d1397060dab0aba02ce35b7d182394d8b0a84a42984d2508868673d36b2c 5b27d1397060dab0aba02ce35b7d182394d8b0a84a42984d2508868673d36b2c
 Path/gen_path.rs 9c70415477de7f794bc1b43eb5cc62a9d8280e312c0aa2039c7bf1f8d6760fb2 9c70415477de7f794bc1b43eb5cc62a9d8280e312c0aa2039c7bf1f8d6760fb2
-PathExpr/gen_path_expr.rs b29cc007c4a158fb2bc464db02464614f1664a80c67a81696978e2715ce2652d b29cc007c4a158fb2bc464db02464614f1664a80c67a81696978e2715ce2652d
+PathExpr/gen_path_expr.rs 5df9c18f835d840d95a9cf1d6dfd2870dd97947d7df5ba01d987e66ed9afbb38 5df9c18f835d840d95a9cf1d6dfd2870dd97947d7df5ba01d987e66ed9afbb38
 PathPat/gen_path_pat.rs a858875ccc5baffb04c46127e1f4cd41e5fcc7843eebbdf791c20ba2efe78e5a a858875ccc5baffb04c46127e1f4cd41e5fcc7843eebbdf791c20ba2efe78e5a
 PrefixExpr/gen_prefix_expr.rs 0fe7608d3c57813db30f36fde77a55d804e009f00d62e232fd050d5cfc5b1eaf 0fe7608d3c57813db30f36fde77a55d804e009f00d62e232fd050d5cfc5b1eaf
 RangeExpr/gen_range_expr.rs 3d77ccdc55a774c41b7d34773e5c65e4fdad6ef76aadd4d24c2694b324e9c006 3d77ccdc55a774c41b7d34773e5c65e4fdad6ef76aadd4d24c2694b324e9c006
@@ -53,7 +53,7 @@ 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
-Type/gen_type.rs c66f700db04fd4f2dd76ebe6fefbf5fff01e005df50ccf15885cc0ff7c138c26 c66f700db04fd4f2dd76ebe6fefbf5fff01e005df50ccf15885cc0ff7c138c26
+TypeRef/gen_type_ref.rs 86362efc37ef9d8383854ac831ba576982e6676d037a85b45a5f7f4a3e8ff1e3 86362efc37ef9d8383854ac831ba576982e6676d037a85b45a5f7f4a3e8ff1e3
 UnderscoreExpr/gen_underscore_expr.rs 34bfcf5e4a865e882aa40fdfdb93237a4ccfb0c1fb053ae184a38719b3727b7a 34bfcf5e4a865e882aa40fdfdb93237a4ccfb0c1fb053ae184a38719b3727b7a
 UnsafeBlockExpr/gen_unsafe_block_expr.rs 250656a4c0333c1260617117ae7ca96fc265d5109f948b90dce071867d020486 250656a4c0333c1260617117ae7ca96fc265d5109f948b90dce071867d020486
 WildcardPat/gen_wildcard_pat.rs aa5a5bc28a5fabe45f3d522e1b59bdf2fa5bd2848ec1f32263ef1f39a6b0290a aa5a5bc28a5fabe45f3d522e1b59bdf2fa5bd2848ec1f32263ef1f39a6b0290a
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -4,7 +4,7 @@
 /AsyncBlockExpr/gen_async_block_expr.rs linguist-generated
 /AwaitExpr/gen_await_expr.rs linguist-generated
 /BecomeExpr/gen_become_expr.rs linguist-generated
-/BinExpr/gen_bin_expr.rs linguist-generated
+/BinaryExpr/gen_binary_expr.rs linguist-generated
 /BlockExpr/gen_block_expr.rs linguist-generated
 /BoxExpr/gen_box_expr.rs linguist-generated
 /BoxPat/gen_box_pat.rs linguist-generated
@@ -26,7 +26,7 @@
 /Label/gen_label.rs linguist-generated
 /LetExpr/gen_let_expr.rs linguist-generated
 /LetStmt/gen_let_stmt.rs linguist-generated
-/Literal/gen_literal.rs linguist-generated
+/LiteralExpr/gen_literal_expr.rs linguist-generated
 /LiteralPat/gen_literal_pat.rs linguist-generated
 /LoopExpr/gen_loop_expr.rs linguist-generated
 /MatchArm/gen_match_arm.rs linguist-generated
@@ -55,7 +55,7 @@
 /TupleExpr/gen_tuple_expr.rs linguist-generated
 /TuplePat/gen_tuple_pat.rs linguist-generated
 /TupleStructPat/gen_tuple_struct_pat.rs linguist-generated
-/Type/gen_type.rs linguist-generated
+/TypeRef/gen_type_ref.rs linguist-generated
 /UnderscoreExpr/gen_underscore_expr.rs linguist-generated
 /UnsafeBlockExpr/gen_unsafe_block_expr.rs linguist-generated
 /WildcardPat/gen_wildcard_pat.rs linguist-generated
--- a/rust/ql/test/extractor-tests/generated/BinExpr/BinExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BinExpr/BinExpr.expected
@@ -1,5 +0,0 @@
-| gen_bin_expr.rs:5:5:5:9 | BinExpr | getLhs: | gen_bin_expr.rs:5:5:5:5 | PathExpr | getRhs: | gen_bin_expr.rs:5:9:5:9 | PathExpr | hasOp: | yes |
-| gen_bin_expr.rs:6:5:6:10 | BinExpr | getLhs: | gen_bin_expr.rs:6:5:6:5 | PathExpr | getRhs: | gen_bin_expr.rs:6:10:6:10 | PathExpr | hasOp: | yes |
-| gen_bin_expr.rs:7:5:7:10 | BinExpr | getLhs: | gen_bin_expr.rs:7:5:7:5 | PathExpr | getRhs: | gen_bin_expr.rs:7:10:7:10 | PathExpr | hasOp: | yes |
-| gen_bin_expr.rs:8:5:8:9 | BinExpr | getLhs: | gen_bin_expr.rs:8:5:8:5 | PathExpr | getRhs: | gen_bin_expr.rs:8:9:8:9 | PathExpr | hasOp: | yes |
-| gen_bin_expr.rs:9:5:9:10 | BinExpr | getLhs: | gen_bin_expr.rs:9:5:9:5 | PathExpr | getRhs: | gen_bin_expr.rs:9:10:9:10 | PathExpr | hasOp: | yes |
--- a/rust/ql/test/extractor-tests/generated/BinExpr/BinExpr_getOp.expected
+++ b/rust/ql/test/extractor-tests/generated/BinExpr/BinExpr_getOp.expected
@@ -1,5 +0,0 @@
-| gen_bin_expr.rs:5:5:5:9 | BinExpr | + |
-| gen_bin_expr.rs:6:5:6:10 | BinExpr | && |
-| gen_bin_expr.rs:7:5:7:10 | BinExpr | <= |
-| gen_bin_expr.rs:8:5:8:9 | BinExpr | = |
-| gen_bin_expr.rs:9:5:9:10 | BinExpr | += |
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.expected
@@ -0,0 +1,5 @@
+| gen_binary_expr.rs:5:5:5:9 | BinaryExpr | getLhs: | gen_binary_expr.rs:5:5:5:5 | PathExpr | getRhs: | gen_binary_expr.rs:5:9:5:9 | PathExpr | hasOp: | yes |
+| gen_binary_expr.rs:6:5:6:10 | BinaryExpr | getLhs: | gen_binary_expr.rs:6:5:6:5 | PathExpr | getRhs: | gen_binary_expr.rs:6:10:6:10 | PathExpr | hasOp: | yes |
+| gen_binary_expr.rs:7:5:7:10 | BinaryExpr | getLhs: | gen_binary_expr.rs:7:5:7:5 | PathExpr | getRhs: | gen_binary_expr.rs:7:10:7:10 | PathExpr | hasOp: | yes |
+| gen_binary_expr.rs:8:5:8:9 | BinaryExpr | getLhs: | gen_binary_expr.rs:8:5:8:5 | PathExpr | getRhs: | gen_binary_expr.rs:8:9:8:9 | PathExpr | hasOp: | yes |
+| gen_binary_expr.rs:9:5:9:10 | BinaryExpr | getLhs: | gen_binary_expr.rs:9:5:9:5 | PathExpr | getRhs: | gen_binary_expr.rs:9:10:9:10 | PathExpr | hasOp: | yes |
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils

-from BinExpr x, Expr getLhs, Expr getRhs, string hasOp
+from BinaryExpr x, Expr getLhs, Expr getRhs, string hasOp
 where
  toBeTested(x) and
  not x.isUnknown() and
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.expected
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.expected
@@ -0,0 +1,5 @@
+| gen_binary_expr.rs:5:5:5:9 | BinaryExpr | + |
+| gen_binary_expr.rs:6:5:6:10 | BinaryExpr | && |
+| gen_binary_expr.rs:7:5:7:10 | BinaryExpr | <= |
+| gen_binary_expr.rs:8:5:8:9 | BinaryExpr | = |
+| gen_binary_expr.rs:9:5:9:10 | BinaryExpr | += |
--- a/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql
+++ b/rust/ql/test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOp.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

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

-fn test_bin_expr() -> () {
+fn test_binary_expr() -> () {
    // A binary operation expression. For example:
    x + y;
    x && y;
--- a/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BoxExpr/BoxExpr.expected
@@ -1 +1 @@
-| gen_box_expr.rs:5:13:5:37 | BoxExpr | getExpr: | gen_box_expr.rs:5:35:5:36 | Literal |
+| gen_box_expr.rs:5:13:5:37 | BoxExpr | getExpr: | gen_box_expr.rs:5:35:5:36 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected
@@ -1 +1 @@
-| gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:12:26:12:27 | Literal |
+| gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:12:26:12:27 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.expected
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.expected
@@ -1,4 +1,4 @@
-| gen_call_expr.rs:5:5:5:11 | CallExpr | 0 | gen_call_expr.rs:5:9:5:10 | Literal |
-| gen_call_expr.rs:6:5:6:23 | CallExpr | 0 | gen_call_expr.rs:6:21:6:22 | Literal |
-| gen_call_expr.rs:7:5:7:14 | CallExpr | 0 | gen_call_expr.rs:7:12:7:13 | Literal |
-| gen_call_expr.rs:8:5:8:10 | CallExpr | 0 | gen_call_expr.rs:8:9:8:9 | Literal |
+| gen_call_expr.rs:5:5:5:11 | CallExpr | 0 | gen_call_expr.rs:5:9:5:10 | LiteralExpr |
+| gen_call_expr.rs:6:5:6:23 | CallExpr | 0 | gen_call_expr.rs:6:21:6:22 | LiteralExpr |
+| gen_call_expr.rs:7:5:7:14 | CallExpr | 0 | gen_call_expr.rs:7:12:7:13 | LiteralExpr |
+| gen_call_expr.rs:8:5:8:10 | CallExpr | 0 | gen_call_expr.rs:8:9:8:9 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
@@ -1 +1 @@
-| gen_cast_expr.rs:5:5:5:16 | CastExpr | getExpr: | gen_cast_expr.rs:5:5:5:9 | PathExpr | getType: | file://:0:0:0:0 | Type |
+| gen_cast_expr.rs:5:5:5:16 | CastExpr | getExpr: | gen_cast_expr.rs:5:5:5:9 | PathExpr | getType: | file://:0:0:0:0 | TypeRef |
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils

-from CastExpr x, Expr getExpr, Type getType
+from CastExpr x, Expr getExpr, TypeRef getType
 where
  toBeTested(x) and
  not x.isUnknown() and
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
@@ -1,5 +1,5 @@
-| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | no | getBody: | gen_closure_expr.rs:5:9:5:13 | BinExpr | getClosureKind: | Closure | isMove: | no |
+| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | no | getBody: | gen_closure_expr.rs:5:9:5:13 | BinaryExpr | getClosureKind: | Closure | isMove: | no |
 | gen_closure_expr.rs:6:5:6:34 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | yes | getBody: | gen_closure_expr.rs:6:26:6:34 | BlockExpr | getClosureKind: | Closure | isMove: | yes |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | getNumberOfArgs: | 2 | hasRetType: | no | getBody: | gen_closure_expr.rs:7:23:7:27 | BinExpr | getClosureKind: | Async | isMove: | no |
+| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | getNumberOfArgs: | 2 | hasRetType: | no | getBody: | gen_closure_expr.rs:7:23:7:27 | BinaryExpr | getClosureKind: | Async | isMove: | no |
 | gen_closure_expr.rs:8:6:9:15 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | no | getBody: | gen_closure_expr.rs:9:9:9:15 | YieldExpr | getClosureKind: | Coroutine(Movable) | isMove: | no |
 | gen_closure_expr.rs:10:6:11:23 | ClosureExpr | getNumberOfArgs: | 1 | hasRetType: | no | getBody: | gen_closure_expr.rs:11:17:11:23 | YieldExpr | getClosureKind: | Coroutine(Static) | isMove: | no |
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getArgType.expected
@@ -1,2 +1,2 @@
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | 0 | file://:0:0:0:0 | Type |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | 0 | file://:0:0:0:0 | Type |
+| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | 0 | file://:0:0:0:0 | TypeRef |
+| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | 0 | file://:0:0:0:0 | TypeRef |
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
@@ -1 +1 @@
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | file://:0:0:0:0 | Type |
+| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | file://:0:0:0:0 | TypeRef |
--- a/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.expected
+++ b/rust/ql/test/extractor-tests/generated/ElementListExpr/ElementListExpr_getElement.expected
@@ -1,10 +1,10 @@
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 0 | gen_element_list_expr.rs:5:6:5:6 | Literal |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 1 | gen_element_list_expr.rs:5:9:5:9 | Literal |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 2 | gen_element_list_expr.rs:5:12:5:12 | Literal |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 3 | gen_element_list_expr.rs:5:15:5:15 | Literal |
-| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 4 | gen_element_list_expr.rs:5:18:5:18 | Literal |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 0 | gen_element_list_expr.rs:6:6:6:6 | Literal |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 1 | gen_element_list_expr.rs:6:9:6:9 | Literal |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 2 | gen_element_list_expr.rs:6:12:6:12 | Literal |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 3 | gen_element_list_expr.rs:6:15:6:15 | Literal |
-| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 4 | gen_element_list_expr.rs:6:18:6:18 | Literal |
+| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 0 | gen_element_list_expr.rs:5:6:5:6 | LiteralExpr |
+| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 1 | gen_element_list_expr.rs:5:9:5:9 | LiteralExpr |
+| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 2 | gen_element_list_expr.rs:5:12:5:12 | LiteralExpr |
+| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 3 | gen_element_list_expr.rs:5:15:5:15 | LiteralExpr |
+| gen_element_list_expr.rs:5:5:5:19 | ElementListExpr | 4 | gen_element_list_expr.rs:5:18:5:18 | LiteralExpr |
+| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 0 | gen_element_list_expr.rs:6:6:6:6 | LiteralExpr |
+| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 1 | gen_element_list_expr.rs:6:9:6:9 | LiteralExpr |
+| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 2 | gen_element_list_expr.rs:6:12:6:12 | LiteralExpr |
+| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 3 | gen_element_list_expr.rs:6:15:6:15 | LiteralExpr |
+| gen_element_list_expr.rs:6:5:6:19 | ElementListExpr | 4 | gen_element_list_expr.rs:6:18:6:18 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/File/File.expected
+++ b/rust/ql/test/extractor-tests/generated/File/File.expected
@@ -1,3 +0,0 @@
-| file://:0:0:0:0 |  | UnknownFile | getName: |  |
-| lib.rs:0:0:0:0 | lib.rs | DbFile | getName: | lib.rs |
-| test.rs:0:0:0:0 | test.rs | DbFile | getName: | test.rs |
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected
@@ -1,2 +1,2 @@
-| gen_if_expr.rs:5:5:7:5 | IfExpr | getCondition: | gen_if_expr.rs:5:8:5:14 | BinExpr | getThen: | gen_if_expr.rs:5:16:7:5 | BlockExpr | hasElse: | no |
-| gen_if_expr.rs:8:13:12:5 | IfExpr | getCondition: | gen_if_expr.rs:8:16:8:20 | BinExpr | getThen: | gen_if_expr.rs:8:22:10:5 | BlockExpr | hasElse: | yes |
+| gen_if_expr.rs:5:5:7:5 | IfExpr | getCondition: | gen_if_expr.rs:5:8:5:14 | BinaryExpr | getThen: | gen_if_expr.rs:5:16:7:5 | BlockExpr | hasElse: | no |
+| gen_if_expr.rs:8:13:12:5 | IfExpr | getCondition: | gen_if_expr.rs:8:16:8:20 | BinaryExpr | getThen: | gen_if_expr.rs:8:22:10:5 | BlockExpr | hasElse: | yes |
--- a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected
@@ -1,2 +1,2 @@
-| gen_index_expr.rs:5:5:5:12 | IndexExpr | getBase: | gen_index_expr.rs:5:5:5:8 | PathExpr | getIndex: | gen_index_expr.rs:5:10:5:11 | Literal | isAssigneeExpr: | no |
-| gen_index_expr.rs:6:5:6:12 | IndexExpr | getBase: | gen_index_expr.rs:6:5:6:8 | PathExpr | getIndex: | gen_index_expr.rs:6:10:6:11 | Literal | isAssigneeExpr: | yes |
+| gen_index_expr.rs:5:5:5:12 | IndexExpr | getBase: | gen_index_expr.rs:5:5:5:8 | PathExpr | getIndex: | gen_index_expr.rs:5:10:5:11 | LiteralExpr | isAssigneeExpr: | no |
+| gen_index_expr.rs:6:5:6:12 | IndexExpr | getBase: | gen_index_expr.rs:6:5:6:8 | PathExpr | getIndex: | gen_index_expr.rs:6:10:6:11 | LiteralExpr | isAssigneeExpr: | yes |
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected
@@ -1,4 +1,4 @@
-| gen_let_stmt.rs:5:9:5:9 | LetStmt | gen_let_stmt.rs:5:13:5:14 | Literal |
-| gen_let_stmt.rs:6:9:6:9 | LetStmt | gen_let_stmt.rs:6:18:6:19 | Literal |
+| gen_let_stmt.rs:5:9:5:9 | LetStmt | gen_let_stmt.rs:5:13:5:14 | LiteralExpr |
+| gen_let_stmt.rs:6:9:6:9 | LetStmt | gen_let_stmt.rs:6:18:6:19 | LiteralExpr |
 | gen_let_stmt.rs:9:9:9:14 | LetStmt | gen_let_stmt.rs:9:18:9:23 | TupleExpr |
 | gen_let_stmt.rs:10:9:10:15 | LetStmt | gen_let_stmt.rs:10:19:10:38 | CallExpr |
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.expected
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getType.expected
@@ -1,2 +1,2 @@
-| gen_let_stmt.rs:6:9:6:9 | LetStmt | file://:0:0:0:0 | Type |
-| gen_let_stmt.rs:7:9:7:9 | LetStmt | file://:0:0:0:0 | Type |
+| gen_let_stmt.rs:6:9:6:9 | LetStmt | file://:0:0:0:0 | TypeRef |
+| gen_let_stmt.rs:7:9:7:9 | LetStmt | file://:0:0:0:0 | TypeRef |
--- a/rust/ql/test/extractor-tests/generated/Literal/Literal.expected
+++ b/rust/ql/test/extractor-tests/generated/Literal/Literal.expected
@@ -1,8 +0,0 @@
-| gen_literal.rs:5:5:5:6 | Literal |
-| gen_literal.rs:6:5:6:8 | Literal |
-| gen_literal.rs:7:5:7:19 | Literal |
-| gen_literal.rs:8:5:8:20 | Literal |
-| gen_literal.rs:9:5:9:7 | Literal |
-| gen_literal.rs:10:5:10:8 | Literal |
-| gen_literal.rs:11:5:11:20 | Literal |
-| gen_literal.rs:12:5:12:8 | Literal |
--- a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.expected
@@ -0,0 +1,8 @@
+| gen_literal_expr.rs:5:5:5:6 | LiteralExpr |
+| gen_literal_expr.rs:6:5:6:8 | LiteralExpr |
+| gen_literal_expr.rs:7:5:7:19 | LiteralExpr |
+| gen_literal_expr.rs:8:5:8:20 | LiteralExpr |
+| gen_literal_expr.rs:9:5:9:7 | LiteralExpr |
+| gen_literal_expr.rs:10:5:10:8 | LiteralExpr |
+| gen_literal_expr.rs:11:5:11:20 | LiteralExpr |
+| gen_literal_expr.rs:12:5:12:8 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

-from Type x
+from LiteralExpr 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() -> () {
+fn test_literal_expr() -> () {
    // A literal expression. For example:
    42;
    42.0;
--- a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected
+++ b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected
@@ -1 +1 @@
-| gen_literal_pat.rs:6:9:6:10 | LiteralPat | getExpr: | gen_literal_pat.rs:6:9:6:10 | Literal |
+| gen_literal_pat.rs:6:9:6:10 | LiteralPat | getExpr: | gen_literal_pat.rs:6:9:6:10 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected
@@ -1,4 +1,4 @@
 | gen_match_arm.rs:6:9:6:23 | MatchArm | getPat: | gen_match_arm.rs:6:9:6:23 | TupleStructPat | hasGuard: | no | getExpr: | gen_match_arm.rs:6:28:6:28 | PathExpr |
-| gen_match_arm.rs:7:9:7:20 | MatchArm | getPat: | gen_match_arm.rs:7:9:7:20 | PathPat | hasGuard: | no | getExpr: | gen_match_arm.rs:7:25:7:25 | Literal |
-| gen_match_arm.rs:10:9:10:15 | MatchArm | getPat: | gen_match_arm.rs:10:9:10:15 | TupleStructPat | hasGuard: | yes | getExpr: | gen_match_arm.rs:10:30:10:34 | BinExpr |
-| gen_match_arm.rs:11:9:11:9 | MatchArm | getPat: | gen_match_arm.rs:11:9:11:9 | WildcardPat | hasGuard: | no | getExpr: | gen_match_arm.rs:11:14:11:14 | Literal |
+| gen_match_arm.rs:7:9:7:20 | MatchArm | getPat: | gen_match_arm.rs:7:9:7:20 | PathPat | hasGuard: | no | getExpr: | gen_match_arm.rs:7:25:7:25 | LiteralExpr |
+| gen_match_arm.rs:10:9:10:15 | MatchArm | getPat: | gen_match_arm.rs:10:9:10:15 | TupleStructPat | hasGuard: | yes | getExpr: | gen_match_arm.rs:10:30:10:34 | BinaryExpr |
+| gen_match_arm.rs:11:9:11:9 | MatchArm | getPat: | gen_match_arm.rs:11:9:11:9 | WildcardPat | hasGuard: | no | getExpr: | gen_match_arm.rs:11:14:11:14 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected
@@ -1 +1 @@
-| gen_match_arm.rs:10:9:10:15 | MatchArm | gen_match_arm.rs:10:20:10:25 | BinExpr |
+| gen_match_arm.rs:10:9:10:15 | MatchArm | gen_match_arm.rs:10:20:10:25 | BinaryExpr |
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.expected
@@ -1,2 +1,2 @@
-| gen_method_call_expr.rs:5:5:5:13 | MethodCallExpr | 0 | gen_method_call_expr.rs:5:11:5:12 | Literal |
-| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | 0 | gen_method_call_expr.rs:6:23:6:24 | Literal |
+| gen_method_call_expr.rs:5:5:5:13 | MethodCallExpr | 0 | gen_method_call_expr.rs:5:11:5:12 | LiteralExpr |
+| gen_method_call_expr.rs:6:5:6:25 | MethodCallExpr | 0 | gen_method_call_expr.rs:6:23:6:24 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
@@ -1 +1 @@
-| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | getContainer: | file://:0:0:0:0 | Type | getNumberOfFields: | 1 |
+| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | getContainer: | file://:0:0:0:0 | TypeRef | getNumberOfFields: | 1 |
--- 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, Type getContainer, int getNumberOfFields
+from OffsetOfExpr x, TypeRef getContainer, int getNumberOfFields
 where
  toBeTested(x) and
  not x.isUnknown() and
--- a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected
@@ -1,4 +1,4 @@
 | gen_path_expr.rs:5:13:5:20 | PathExpr | getPath: | gen_path_expr.rs:5:13:5:20 | Path |
 | gen_path_expr.rs:6:13:6:20 | PathExpr | getPath: | gen_path_expr.rs:6:13:6:20 | Path |
 | gen_path_expr.rs:7:13:7:20 | PathExpr | getPath: | gen_path_expr.rs:7:13:7:20 | Path |
-| gen_path_expr.rs:8:13:8:32 | PathExpr | getPath: | gen_path_expr.rs:8:13:8:32 | Path |
+| gen_path_expr.rs:8:13:8:35 | PathExpr | getPath: | gen_path_expr.rs:8:13:8:35 | Path |
--- a/rust/ql/test/extractor-tests/generated/PathExpr/gen_path_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/PathExpr/gen_path_expr.rs
@@ -5,5 +5,5 @@ fn test_path_expr() -> () {
    let x = variable;
    let x = foo::bar;
    let y = <T>::foo;
-    let z = <Type as Trait>::foo;
+    let z = <TypeRef as Trait>::foo;
 }
--- a/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/PrefixExpr/PrefixExpr.expected
@@ -1,3 +1,3 @@
-| gen_prefix_expr.rs:5:13:5:15 | PrefixExpr | getExpr: | gen_prefix_expr.rs:5:14:5:15 | Literal | getOp: | - |
-| gen_prefix_expr.rs:6:13:6:17 | PrefixExpr | getExpr: | gen_prefix_expr.rs:6:14:6:17 | Literal | getOp: | ! |
+| gen_prefix_expr.rs:5:13:5:15 | PrefixExpr | getExpr: | gen_prefix_expr.rs:5:14:5:15 | LiteralExpr | getOp: | - |
+| gen_prefix_expr.rs:6:13:6:17 | PrefixExpr | getExpr: | gen_prefix_expr.rs:6:14:6:17 | LiteralExpr | getOp: | ! |
 | gen_prefix_expr.rs:7:13:7:16 | PrefixExpr | getExpr: | gen_prefix_expr.rs:7:14:7:16 | PathExpr | getOp: | * |
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.expected
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getLhs.expected
@@ -1,3 +1,3 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:13:5:13 | Literal |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:13:6:13 | Literal |
-| gen_range_expr.rs:7:13:7:16 | RangeExpr | gen_range_expr.rs:7:13:7:14 | Literal |
+| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:13:5:13 | LiteralExpr |
+| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:13:6:13 | LiteralExpr |
+| gen_range_expr.rs:7:13:7:16 | RangeExpr | gen_range_expr.rs:7:13:7:14 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.expected
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getRhs.expected
@@ -1,4 +1,4 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:17:5:18 | Literal |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:16:6:17 | Literal |
-| gen_range_expr.rs:8:13:8:16 | RangeExpr | gen_range_expr.rs:8:15:8:16 | Literal |
-| gen_range_expr.rs:9:13:9:17 | RangeExpr | gen_range_expr.rs:9:16:9:17 | Literal |
+| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:17:5:18 | LiteralExpr |
+| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:16:6:17 | LiteralExpr |
+| gen_range_expr.rs:8:13:8:16 | RangeExpr | gen_range_expr.rs:8:15:8:16 | LiteralExpr |
+| gen_range_expr.rs:9:13:9:17 | RangeExpr | gen_range_expr.rs:9:16:9:17 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
@@ -1,2 +1,2 @@
-| gen_record_expr_field.rs:5:14:5:14 | RecordExprField | getName: | a | getExpr: | gen_record_expr_field.rs:5:14:5:14 | Literal |
-| gen_record_expr_field.rs:5:20:5:20 | RecordExprField | getName: | b | getExpr: | gen_record_expr_field.rs:5:20:5:20 | Literal |
+| gen_record_expr_field.rs:5:14:5:14 | RecordExprField | getName: | a | getExpr: | gen_record_expr_field.rs:5:14:5:14 | LiteralExpr |
+| gen_record_expr_field.rs:5:20:5:20 | RecordExprField | getName: | b | getExpr: | gen_record_expr_field.rs:5:20:5:20 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/RepeatExpr/RepeatExpr.expected
@@ -1 +1 @@
-| gen_repeat_expr.rs:5:5:5:11 | RepeatExpr | getInitializer: | gen_repeat_expr.rs:5:6:5:6 | Literal | getRepeat: | gen_repeat_expr.rs:5:9:5:10 | Literal |
+| gen_repeat_expr.rs:5:5:5:11 | RepeatExpr | getInitializer: | gen_repeat_expr.rs:5:6:5:6 | LiteralExpr | getRepeat: | gen_repeat_expr.rs:5:9:5:10 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected
@@ -1 +1 @@
-| gen_return_expr.rs:5:5:5:13 | ReturnExpr | gen_return_expr.rs:5:12:5:13 | Literal |
+| gen_return_expr.rs:5:5:5:13 | ReturnExpr | gen_return_expr.rs:5:12:5:13 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr_getExpr.expected
@@ -1,4 +1,4 @@
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 0 | gen_tuple_expr.rs:5:6:5:6 | Literal |
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 1 | gen_tuple_expr.rs:5:9:5:13 | Literal |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 0 | gen_tuple_expr.rs:6:6:6:6 | Literal |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 1 | gen_tuple_expr.rs:6:9:6:13 | Literal |
+| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 0 | gen_tuple_expr.rs:5:6:5:6 | LiteralExpr |
+| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 1 | gen_tuple_expr.rs:5:9:5:13 | LiteralExpr |
+| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 0 | gen_tuple_expr.rs:6:6:6:6 | LiteralExpr |
+| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 1 | gen_tuple_expr.rs:6:9:6:13 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/Type/Type.expected
+++ b/rust/ql/test/extractor-tests/generated/Type/Type.expected
@@ -1,3 +0,0 @@
-| file://:0:0:0:0 | Type |
-| file://:0:0:0:0 | Type |
-| file://:0:0:0:0 | Type |
--- a/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.expected
+++ b/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.expected
@@ -0,0 +1,3 @@
+| file://:0:0:0:0 | TypeRef |
+| file://:0:0:0:0 | TypeRef |
+| file://:0:0:0:0 | TypeRef |
--- a/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeRef/TypeRef.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils

-from Literal x
+from TypeRef 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() -> () {
+fn test_type_ref() -> () {
    // The base class for type references.
    let x: i32;
    let y: Vec<i32>;
--- a/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/YeetExpr/YeetExpr_getExpr.expected
@@ -1 +1 @@
-| gen_yeet_expr.rs:6:8:6:36 | YeetExpr | gen_yeet_expr.rs:6:16:6:36 | Literal |
+| gen_yeet_expr.rs:6:8:6:36 | YeetExpr | gen_yeet_expr.rs:6:16:6:36 | LiteralExpr |
--- a/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/YieldExpr/YieldExpr_getExpr.expected
@@ -1 +1 @@
-| gen_yield_expr.rs:7:13:7:19 | YieldExpr | gen_yield_expr.rs:7:19:7:19 | Literal |
+| gen_yield_expr.rs:7:13:7:19 | YieldExpr | gen_yield_expr.rs:7:19:7:19 | LiteralExpr |
--- a/rust/schema.py
+++ b/rust/schema.py
@@ -24,6 +24,7 @@ class Element:
 class Locatable(Element):
    pass

+
@qltest.skip
 class AstNode(Locatable):
    pass
@@ -103,7 +104,7 @@ class Stmt(AstNode):


@rust.doc_test_signature("() -> ()")
-class Type(AstNode, Unimplemented):
+class TypeRef(AstNode, Unimplemented):
    """
    The base class for type references.
    ```
@@ -174,7 +175,7 @@ class PathExpr(Expr):
    let x = variable;
    let x = foo::bar;
    let y = <T>::foo;
-    let z = <Type as Trait>::foo;
+    let z = <TypeRef as Trait>::foo;
    ```
    """
    path: Path | child
@@ -553,7 +554,7 @@ class CastExpr(Expr):
    ```
    """
    expr: Expr | child
-    type: Type | child
+    type: TypeRef | child


@rust.doc_test_signature("() -> ()")
@@ -598,7 +599,7 @@ class PrefixExpr(Expr):


@rust.doc_test_signature("() -> ()")
-class BinExpr(Expr):
+class BinaryExpr(Expr):
    """
    A binary operation expression. For example:
    ```
@@ -661,8 +662,8 @@ class ClosureExpr(Expr):
    ```
    """
    args: list[Pat] | child
-    arg_types: list[optional[Type]] | child
-    ret_type: optional[Type] | child
+    arg_types: list[optional[TypeRef]] | child
+    ret_type: optional[TypeRef] | child
    body: Expr | child
    closure_kind: string
    is_move: predicate
@@ -717,7 +718,7 @@ class RepeatExpr(ArrayExpr):


@rust.doc_test_signature("() -> ()")
-class Literal(Expr):
+class LiteralExpr(Expr):
    """
    A literal expression. For example:
    ```
@@ -752,7 +753,7 @@ class OffsetOfExpr(Expr):
    builtin # offset_of(Struct, field);
    ```
    """
-    container: Type | child
+    container: TypeRef | child
    fields: list[string]


@@ -785,7 +786,7 @@ class LetStmt(Stmt):

    """
    pat: Pat | child
-    type: optional[Type] | child
+    type: optional[TypeRef] | child
    initializer: optional[Expr] | child
    else_: optional[Expr] | child